From adf77d4ac56c0fc7fed7ca1583672457ff5f130d Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 21 Mar 2019 18:07:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponController.java | 5 ++++- .../src/main/java/com/iformall/domain/po/WxCoupon.java | 3 +-- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) 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 @@