From beae6e9dac85bd7dd648ba2534d5d2ac0b1c5778 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Jun 2023 22:06:41 +0800 Subject: [PATCH] //yuyue --- .../controller/market/WxCouponOrderReservationController.java | 4 ++-- .../controller/WxCouponOrderReservationController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 d2deceed3..e93f9f48b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java @@ -100,8 +100,8 @@ public class WxCouponOrderReservationController extends BaseController { } } if(EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){ - if(!EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持取消"); + if(!EnumCouponOrderReservationStatus.getReservationIng().contains(sortReservation.getStatus())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持取消确认"); } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java index 66520ebe7..71493cfb0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java @@ -102,8 +102,8 @@ public class WxCouponOrderReservationController extends BaseController { } } if(EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){ - if(!EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持取消"); + if(!EnumCouponOrderReservationStatus.getReservationIng().contains(sortReservation.getStatus())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持取消确认"); } }