|
|
|
@@ -184,8 +184,8 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
} |
|
|
|
if(wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) |
|
|
|
&& wxCouponOrderCVo.getPickStartDate() != null && wxCouponOrderCVo.getPickEndDate() != null){ |
|
|
|
wxCouponOrderCVo.setValidStartDate(wxCouponOrderCVo.getPickStartDate()); |
|
|
|
wxCouponOrderCVo.setValidEndDate(wxCouponOrderCVo.getPickEndDate()); |
|
|
|
// wxCouponOrderCVo.setValidStartDate(wxCouponOrderCVo.getPickStartDate()); |
|
|
|
// wxCouponOrderCVo.setValidEndDate(wxCouponOrderCVo.getPickEndDate()); |
|
|
|
if (wxCouponOrderCVo.getPickStartDate().getTime() > now.getTime()) { |
|
|
|
wxCouponOrderCVo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); |
|
|
|
} else if (wxCouponOrderCVo.getPickEndDate().getTime() < now.getTime()) { |
|
|
|
|