From 9673af41673c82a1055a4b04ae1f6f6d23f6950b Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 7 Nov 2018 17:42:50 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E5=8D=A1=E5=88=B8=E4=BD=9C=E5=BA=9F,=E5=92=8C?= =?UTF-8?q?=E5=8D=A1=E5=88=B8=E4=B8=8B=E6=9E=B6=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/WxOrderController.java | 4 ++-- .../src/main/java/com/iformall/common/ErrorCode.java | 4 +++- .../java/com/iformall/service/impl/WxGameServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 79d42ece6..0a8c2509e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -61,7 +61,7 @@ public class WxOrderController extends BaseController { } if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) { logger.error("此券已下架:" + couponChannelIdStr); - return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(), "此券已下架"); + return new ResultData(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF.getCode(), "此券已下架"); } if (StringUtils.isBlank(couponIdStr)) { couponId = wxCouponChannel.getCouponId(); @@ -111,7 +111,7 @@ public class WxOrderController extends BaseController { } if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) { logger.error("此券已下架:" + couponChannelIdStr); - return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(), "此券已下架"); + return new ResultData(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF.getCode(), "此券已下架"); } if (StringUtils.isBlank(couponIdStr)) { couponId = wxCouponChannel.getCouponId(); diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index be00d7eaf..e275cf796 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -80,17 +80,19 @@ public enum ErrorCode{ */ COUPON_IS_EMPTY(2020, "此券不存在"), COUPON_IS_NOT_FREE(2021, "此券不免费"), - COUPON_IS_TAKE_OFF(2022, "此券已下架"), + COUPON_IS_TAKE_OFF(2022, "此券已作废"), COUPON_IS_EXPIRED(2023, "此券已过期"), COUPON_IS_SELL_OUT(2024, "此券已售罄"), COUPON_TYPE_IS_NOT_ACTIVE(2025, "此券不能用于主动领取"), COUPON_TYPE_IS_NOT_PASSIVE(2026, "此券不能用于定向投放"), COUPON_CHANNEL_IS_EXISTED(2027, "此券已投放过"), + COUPON_CHANNEL_IS_TAKE_OFF(2031, "此券已下架"), COUPON_SEND_IS_EXISTED(2028, "此券已经添加到该渠道"), COUPON_SEND_IS_INVALID(2029, "此发券渠道不存在"), COUPON_SEND_IS_INVALID_TIME(2030, "发放时间不能晚于使用时间"), + PUSH_LIMIT_UP_TO_1DAYLIMIT(2040, "此用户一天内发券到达疲劳度限制"), PUSH_LIMIT_UP_TO_COUPONLIMIT(2041, "此用户发此券到达疲劳度限制"), PUSH_LIMIT_NOT_INRANG(2042, "不在疲劳度允许的时间段"), 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 9af8adc3e..f19da9a33 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -194,7 +194,7 @@ public class WxGameServiceImpl implements WxGameService { throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); } if (wxCoupon.getValidEndDate() != null && wxCoupon.getValidEndDate().before(new Date())) { - throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); + throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED); } // 更新已有的couponChannel