From 04f62a9e0008cfb2e59c16b52e3edd2851aca56d Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 16 Nov 2018 19:14:54 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E5=81=9C=E8=BD=A6=E5=88=B8=E4=BF=9D=E5=AD=98=E5=87=BA?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/controller/WxCarController.java | 2 +- .../com/iformall/service/impl/MarkingDataReportServiceImpl.java | 2 +- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java index 40ea9ec39..7849ad1f8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java @@ -227,7 +227,7 @@ public class WxCarController extends BaseController { String[] arys = coupon.getBusiness().split(","); wxCoupon.setBusiness(JSON.toJSONString(arys)); } - if(coupon.getId() > 0) { + if(coupon.getId() != null && coupon.getId().longValue() > 0) { wxCoupon.setId(coupon.getId()); } wxCoupon.setType(coupon.getType()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index e921ad979..64c64d8fa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -267,7 +267,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { if(markingCouponDataReportDto.getCouponType()!=null){ params.put("couponType", markingCouponDataReportDto.getCouponType()); } - if(markingCouponDataReportDto.getCouponType()!=null){ + if(markingCouponDataReportDto.getCouponTitle()!=null){ params.put("couponTitle", markingCouponDataReportDto.getCouponTitle()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index dd82e932e..d3c65b8f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -185,7 +185,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize) { - return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); }