소스 검색

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230605

release_toaliyun_real
xhxu 2 년 전
부모
커밋
352c5d822e
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java
  2. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java

+ 2
- 2
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(),"预约单状态不支持取消确认");
}
}



+ 2
- 2
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(),"预约单状态不支持取消确认");
}
}



불러오는 중...
취소
저장