From e59b731bedb043f2ffa34bb79b2d0afcc61b6c2e Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 4 Dec 2020 14:01:52 +0800 Subject: [PATCH] bug --- .../java/com/iformall/controller/WxCouponOrderController.java | 4 ++-- .../main/java/com/iformall/controller/WxOrderController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index ad99b03c0..095b58ffd 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -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()) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 0019a0eda..674f1116d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -366,8 +366,8 @@ public class WxOrderController extends BaseController { } if(wxOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) && wxOrderCVo.getPickStartDate() != null && wxOrderCVo.getPickEndDate() != null){ - wxOrderCVo.setValidStartDate(wxOrderCVo.getPickStartDate()); - wxOrderCVo.setValidEndDate(wxOrderCVo.getPickEndDate()); +// wxOrderCVo.setValidStartDate(wxOrderCVo.getPickStartDate()); +// wxOrderCVo.setValidEndDate(wxOrderCVo.getPickEndDate()); if (wxOrderCVo.getPickStartDate().getTime() > now.getTime()) { wxOrderCVo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); } else if (wxOrderCVo.getPickEndDate().getTime() < now.getTime()) {