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))); }