Browse Source

bug

release_toaliyun_real
xhxu 5 years ago
parent
commit
e59b731bed
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  2. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java

+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java View File

@@ -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()) {


+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java View File

@@ -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()) {


Loading…
Cancel
Save