| @@ -44,6 +44,7 @@ public class WxCouponOrderReservationController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxCouponOrderService wxCouponOrderService; | private WxCouponOrderService wxCouponOrderService; | ||||
| @Autowired | |||||
| private WxCUserBasicInfoService wxCUserBasicInfoService; | private WxCUserBasicInfoService wxCUserBasicInfoService; | ||||
| @ApiOperation("分页列表接口") | @ApiOperation("分页列表接口") | ||||
| @@ -158,9 +159,9 @@ public class WxCouponOrderReservationController extends BaseController { | |||||
| if(EnumCouponOrderReservationStatus.getReservationFinish().contains(sortReservation.getStatus())){ | if(EnumCouponOrderReservationStatus.getReservationFinish().contains(sortReservation.getStatus())){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成"); | 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){ | if(sortReservation.getReservationMerchantId() == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约门店未找到"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约门店未找到"); | ||||
| } | } | ||||