Browse Source

Merge remote-tracking branch 'origin/release_toaliyun_real_20230605' into release_toaliyun_real_20230605

release_toaliyun_real
lrh 2 years ago
parent
commit
92561ac013
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java

+ 4
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java View File

@@ -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(),"预约门店未找到");
}


Loading…
Cancel
Save