From a49c3f77aa2eb2c6e7435a5e81c56831dd2d63b2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 15 Feb 2022 13:31:39 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=82=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxOrderController.java | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index aa2911307..d67f71295 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -303,28 +303,29 @@ public class WxOrderController extends BaseController { border.setId(id); border.setCUserId(memberId); 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()); } } }