Explorar el Código

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

release_toaliyun_real
xhxu hace 2 años
padre
commit
352c5d822e
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  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 Ver fichero

@@ -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 Ver fichero

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



Cargando…
Cancelar
Guardar