From 95a55fadd476b229e0a865b8e7411c8a2e4fc6a5 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 3 Dec 2020 10:04:52 +0800 Subject: [PATCH] bug --- .../java/com/iformall/controller/WxCouponOrderController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 6814bde71..0c4d718b8 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -8,6 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponOrderCVo; +import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumCouponValidType; import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.exception.MallinkException; @@ -257,7 +258,8 @@ public class WxCouponOrderController extends BaseController { } Date now = new Date(); - if (wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { + if (wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode()) + && !wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) { if (wxCouponOrderCVo.getValidStartDate().after(now)) { logger.error("此券有效期未开始:" + couponOrderIdStr); return new ResultData(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE);