| @@ -303,28 +303,29 @@ public class WxOrderController extends BaseController { | |||||
| border.setId(id); | border.setId(id); | ||||
| border.setCUserId(memberId); | border.setCUserId(memberId); | ||||
| WxBatchOrder wxBatchOrder = wxOrderService.batchOrderDetail(border); | WxBatchOrder wxBatchOrder = wxOrderService.batchOrderDetail(border); | ||||
| if(wxBatchOrder != null){ | |||||
| Date now = new Date(); | |||||
| for (WxOrderCouponVo ocvo:wxBatchOrder.getOrders()) { | |||||
| if (ocvo.getValidStartDate() != null && ocvo.getValidEndDate() != null | |||||
| && !ocvo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) { | |||||
| if (ocvo.getValidStartDate().getTime() > now.getTime()) { | |||||
| ocvo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); | |||||
| } else if (ocvo.getValidEndDate().getTime() < now.getTime()) { | |||||
| ocvo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode()); | |||||
| } else { | |||||
| ocvo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); | |||||
| } | |||||
| if(wxBatchOrder == null){ | |||||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | |||||
| } | |||||
| Date now = new Date(); | |||||
| for (WxOrderCouponVo ocvo:wxBatchOrder.getOrders()) { | |||||
| if (ocvo.getValidStartDate() != null && ocvo.getValidEndDate() != null | |||||
| && !ocvo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) { | |||||
| if (ocvo.getValidStartDate().getTime() > now.getTime()) { | |||||
| ocvo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); | |||||
| } else if (ocvo.getValidEndDate().getTime() < now.getTime()) { | |||||
| ocvo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode()); | |||||
| } else { | |||||
| ocvo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); | |||||
| } | } | ||||
| if(ocvo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) | |||||
| && ocvo.getPickStartDate() != null && ocvo.getPickEndDate() != null){ | |||||
| if (ocvo.getPickStartDate().getTime() > now.getTime()) { | |||||
| ocvo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); | |||||
| } else if (ocvo.getPickEndDate().getTime() < now.getTime()) { | |||||
| ocvo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode()); | |||||
| } else { | |||||
| ocvo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); | |||||
| } | |||||
| } | |||||
| if(ocvo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) | |||||
| && ocvo.getPickStartDate() != null && ocvo.getPickEndDate() != null){ | |||||
| if (ocvo.getPickStartDate().getTime() > now.getTime()) { | |||||
| ocvo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); | |||||
| } else if (ocvo.getPickEndDate().getTime() < now.getTime()) { | |||||
| ocvo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode()); | |||||
| } else { | |||||
| ocvo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||