diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
index 9f74ada21..7c677ee83 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
@@ -87,16 +87,16 @@ public class WxCouponOrderBVo extends WxCouponOrder{
@io.swagger.annotations.ApiModelProperty(value = "业态", name = "business")
private Integer business;
- @io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidySum")
- private Integer subsidySum;
+ @io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidyNum")
+ private Integer subsidyNum;
- public String getSubsidySumStr() {
- return new BigDecimal(subsidySum).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString();
+ public String getSubsidyNumStr() {
+ return new BigDecimal(subsidyNum == null ? 0 : subsidyNum).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString();
}
@Excel(name = "补贴额(元)", width = 50, orderNum = "7")
- @io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidySum")
- private String subsidySumStr;
+ @io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidyNumStr")
+ private String subsidyNumStr;
@io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType")
private Integer subsidyType;
diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
index 91f1f748d..8e555184e 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
@@ -370,7 +370,7 @@
-
+
@@ -387,11 +387,11 @@
co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
- c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,c.subsidy_sum,
+ c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,c.subsidy_num,
(case when com.mc=1 then
(select m.name from wx_merchant m, wx_coupon_merchant cm
where m.id = cm.merchant_id and cm.product_id=co.coupon_id and cm.status = 0) else '[多商户通用]' end) as merchant_name,
- case when com.mc = 1 then (select m.id from wx_merchant m,
+ (case when com.mc = 1 then (select m.id from wx_merchant m,
wx_coupon_merchant cm where m.id = cm.merchant_id and cm.product_id = co.coupon_id
and cm.status = 0) else 0 end) as merchant_id
@@ -401,7 +401,7 @@
c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,c.subsidy_sum,
bu.name, bu.phone as bphone,
cu.phone,
- m.name as merchant_name
+ m.name as merchant_name,m.id as merchant_id