|
|
@@ -8,6 +8,7 @@ import com.iformall.common.ResultData; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.vo.WxCouponCVo; |
|
|
import com.iformall.domain.vo.WxCouponCVo; |
|
|
import com.iformall.domain.vo.WxCouponOrderCVo; |
|
|
import com.iformall.domain.vo.WxCouponOrderCVo; |
|
|
|
|
|
import com.iformall.enums.EnumCouponType; |
|
|
import com.iformall.enums.EnumCouponValidType; |
|
|
import com.iformall.enums.EnumCouponValidType; |
|
|
import com.iformall.enums.EnumCreditLockedStatus; |
|
|
import com.iformall.enums.EnumCreditLockedStatus; |
|
|
import com.iformall.exception.MallinkException; |
|
|
import com.iformall.exception.MallinkException; |
|
|
@@ -257,7 +258,8 @@ public class WxCouponOrderController extends BaseController { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
Date now = new Date(); |
|
|
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)) { |
|
|
if (wxCouponOrderCVo.getValidStartDate().after(now)) { |
|
|
logger.error("此券有效期未开始:" + couponOrderIdStr); |
|
|
logger.error("此券有效期未开始:" + couponOrderIdStr); |
|
|
return new ResultData(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE); |
|
|
return new ResultData(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE); |
|
|
|