From 3808ca216c1bca678564a478a09fa784fa1f64d1 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Jun 2023 18:47:58 +0800 Subject: [PATCH] //yuyue --- .../controller/market/WxCouponOrderReservationController.java | 4 +++- .../controller/WxCouponOrderReservationController.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java index 7c4109ac1..d2deceed3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java @@ -73,7 +73,9 @@ public class WxCouponOrderReservationController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成"); } if(EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ - sortReservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode()); + if(reservation.getStartDate() != null ){ + reservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode()); + } } reservation.setRemark("A用户"+getUser().getUsername()+"修改信息"); return wxCouponOrderReservationService.saveOrUpdate(reservation); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java index fcee84d19..66520ebe7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java @@ -72,7 +72,9 @@ public class WxCouponOrderReservationController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成"); } if(EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ - sortReservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode()); + if(reservation.getStartDate() != null ){ + reservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode()); + } } reservation.setRemark("B用户"+getLoginBUser().getPhone()+"修改信息"); return wxCouponOrderReservationService.saveOrUpdate(reservation);