|
|
|
@@ -57,6 +57,10 @@ public class WxOrderController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId不能为空"); |
|
|
|
} |
|
|
|
WxCouponChannel wxCouponChannel = wxCouponChannelService.getById(orderSaveDto.getCouponChannelId()); |
|
|
|
if (wxCouponChannel == null) { |
|
|
|
logger.error("couponChannelId find error, " + orderSaveDto.getCouponChannelId()); |
|
|
|
return new ResultData(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF); |
|
|
|
} |
|
|
|
ResultData resultData = couponChannelCheck(orderSaveDto, wxCouponChannel); |
|
|
|
if (resultData != null) return resultData; |
|
|
|
|
|
|
|
@@ -122,11 +126,6 @@ public class WxOrderController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
private ResultData couponChannelCheck(@RequestBody OrderSaveDto orderSaveDto, WxCouponChannel wxCouponChannel) { |
|
|
|
if (wxCouponChannel == null) { |
|
|
|
logger.error("couponChannelId convert error, " + orderSaveDto.getCouponChannelId()); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR); |
|
|
|
} |
|
|
|
|
|
|
|
if (wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) { |
|
|
|
Date now = new Date(); |
|
|
|
if (wxCouponChannel.getBeginTime().getTime() > now.getTime()) { |
|
|
|
|