From 2c765ceaac9c7f378ae405ba7186f895d9281c50 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 2 Jul 2023 18:01:10 +0800 Subject: [PATCH] //..hexiao --- .../controller/WxCouponOrderReservationController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java index dd9930a42..74b90b93a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java @@ -44,6 +44,7 @@ public class WxCouponOrderReservationController extends BaseController { @Autowired private WxCouponOrderService wxCouponOrderService; + @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; @ApiOperation("分页列表接口") @@ -158,9 +159,9 @@ public class WxCouponOrderReservationController extends BaseController { if(EnumCouponOrderReservationStatus.getReservationFinish().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(),"预约单状态不支持核销"); - } +// if(!EnumCouponOrderReservationStatus.getReservationIng().contains(sortReservation.getStatus())){ +// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持核销"); +// } if(sortReservation.getReservationMerchantId() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约门店未找到"); }