diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
index 46e5fe738..a611515d9 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
@@ -172,8 +172,11 @@ public class WxCouponController extends BaseController {
if(coupon.getSumSubsidy() == null){
coupon.setSumSubsidy(0);
}
+ if(coupon.getSumSubsidy() == null){
+ coupon.setSumSubsidy(0);
+ }
}
- return new ResultData();
+ return new ResultData(pageInfo);
}
@ApiOperation("砍价营销列表接口")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
index e743c3197..70e791443 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
@@ -212,8 +212,7 @@ public class WxCoupon implements Serializable {
//营销分析-----end-----
-
- public Integer getSumSubsidy() {
+ public Integer getSumSubsidy() {
return sumSubsidy;
}
diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index 213554477..65d04c66b 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -44,6 +44,7 @@
+
@@ -754,7 +755,7 @@