diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java index a5d994a7a..112664b0c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java @@ -47,15 +47,9 @@ public class WxCouponSendController extends BaseController { } wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setStatus(0); -<<<<<<< HEAD List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend, 1, 1).getList(); if (wxCouponSendList != null && !wxCouponSendList.isEmpty()) { return new ResultData(Result.ERROR, "已经添加过该券"); -======= - List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend,1,1).getList(); - if(wxCouponSendList!=null&&wxCouponSendList.size()>0){ - return new ResultData(Result.ERROR,"已经添加过该券"); ->>>>>>> 5607026... [小程序投放][修改] 返回错误列表 } WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId()); if (wxCoupon.getStatus() != 0 || wxCoupon.getSendType() != 2) {