From 4668df2abbbd05793f5238501722fe41b7617812 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 14 Mar 2019 10:09:33 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B8=B8=E6=88=8F][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E6=AC=A1=E6=95=B0=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?,=E5=8F=96=E6=B6=88=E5=9C=BA=E6=99=AF=E5=8F=91=E5=88=B8?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCouponSendController.java | 8 +------- .../java/com/iformall/service/impl/WxGameServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java index 311adfd4a..43597b8c2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -62,13 +62,7 @@ public class WxCouponSendController extends BaseController { if (null == wxCouponSend) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - wxCouponSend.setTenantId(getTenantId()); - wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); - List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend, 1, 1).getList(); - if (wxCouponSendList != null && wxCouponSendList.size() > 0) { - return new ResultData(ErrorCode.COUPON_SEND_IS_EXISTED); - } - + WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId()); if (!wxCoupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()) ){ return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index 1c894c9b5..ad8469f60 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -113,7 +113,7 @@ public class WxGameServiceImpl implements WxGameService { if (AwardLimit != 0 && AwardCount > AwardLimit) return new ResultData(ErrorCode.GAME_AWARD_HAS_BEEN_LIMITED,AwardCount - AwardLimit); - return new ResultData(); + return new ResultData(playCount - playLimit); }