From b64970aa666ae6a7e9c7e35e7167ee5b83bfe7fc Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sat, 8 Sep 2018 16:34:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8A=95=E6=94=BE]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCouponSendController.java | 6 ++++++ .../src/main/resources/mapper/WxCouponSendMapper.xml | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java index 112664b0c..a5d994a7a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java @@ -47,9 +47,15 @@ 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) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 27a4be553..66546993c 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -72,10 +72,6 @@ and `send_end_time` = #{sendEndTime} - - and `send_end_time` >= NOW() - and `send_start_time` <= NOW() - and `create_date` = #{createDate}