| @@ -61,7 +61,7 @@ public class WxOrderController extends BaseController { | |||||
| } | } | ||||
| if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) { | if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) { | ||||
| logger.error("此券已下架:" + couponChannelIdStr); | 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)) { | if (StringUtils.isBlank(couponIdStr)) { | ||||
| couponId = wxCouponChannel.getCouponId(); | couponId = wxCouponChannel.getCouponId(); | ||||
| @@ -111,7 +111,7 @@ public class WxOrderController extends BaseController { | |||||
| } | } | ||||
| if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) { | if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) { | ||||
| logger.error("此券已下架:" + couponChannelIdStr); | 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)) { | if (StringUtils.isBlank(couponIdStr)) { | ||||
| couponId = wxCouponChannel.getCouponId(); | couponId = wxCouponChannel.getCouponId(); | ||||
| @@ -80,17 +80,19 @@ public enum ErrorCode{ | |||||
| */ | */ | ||||
| COUPON_IS_EMPTY(2020, "此券不存在"), | COUPON_IS_EMPTY(2020, "此券不存在"), | ||||
| COUPON_IS_NOT_FREE(2021, "此券不免费"), | COUPON_IS_NOT_FREE(2021, "此券不免费"), | ||||
| COUPON_IS_TAKE_OFF(2022, "此券已下架"), | |||||
| COUPON_IS_TAKE_OFF(2022, "此券已作废"), | |||||
| COUPON_IS_EXPIRED(2023, "此券已过期"), | COUPON_IS_EXPIRED(2023, "此券已过期"), | ||||
| COUPON_IS_SELL_OUT(2024, "此券已售罄"), | COUPON_IS_SELL_OUT(2024, "此券已售罄"), | ||||
| COUPON_TYPE_IS_NOT_ACTIVE(2025, "此券不能用于主动领取"), | COUPON_TYPE_IS_NOT_ACTIVE(2025, "此券不能用于主动领取"), | ||||
| COUPON_TYPE_IS_NOT_PASSIVE(2026, "此券不能用于定向投放"), | COUPON_TYPE_IS_NOT_PASSIVE(2026, "此券不能用于定向投放"), | ||||
| COUPON_CHANNEL_IS_EXISTED(2027, "此券已投放过"), | COUPON_CHANNEL_IS_EXISTED(2027, "此券已投放过"), | ||||
| COUPON_CHANNEL_IS_TAKE_OFF(2031, "此券已下架"), | |||||
| COUPON_SEND_IS_EXISTED(2028, "此券已经添加到该渠道"), | COUPON_SEND_IS_EXISTED(2028, "此券已经添加到该渠道"), | ||||
| COUPON_SEND_IS_INVALID(2029, "此发券渠道不存在"), | COUPON_SEND_IS_INVALID(2029, "此发券渠道不存在"), | ||||
| COUPON_SEND_IS_INVALID_TIME(2030, "发放时间不能晚于使用时间"), | COUPON_SEND_IS_INVALID_TIME(2030, "发放时间不能晚于使用时间"), | ||||
| PUSH_LIMIT_UP_TO_1DAYLIMIT(2040, "此用户一天内发券到达疲劳度限制"), | PUSH_LIMIT_UP_TO_1DAYLIMIT(2040, "此用户一天内发券到达疲劳度限制"), | ||||
| PUSH_LIMIT_UP_TO_COUPONLIMIT(2041, "此用户发此券到达疲劳度限制"), | PUSH_LIMIT_UP_TO_COUPONLIMIT(2041, "此用户发此券到达疲劳度限制"), | ||||
| PUSH_LIMIT_NOT_INRANG(2042, "不在疲劳度允许的时间段"), | PUSH_LIMIT_NOT_INRANG(2042, "不在疲劳度允许的时间段"), | ||||
| @@ -194,7 +194,7 @@ public class WxGameServiceImpl implements WxGameService { | |||||
| throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); | throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); | ||||
| } | } | ||||
| if (wxCoupon.getValidEndDate() != null && wxCoupon.getValidEndDate().before(new Date())) { | 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 | // 更新已有的couponChannel | ||||