Procházet zdrojové kódy

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

release_toaliyun_real
xhxu před 2 roky
rodič
revize
352c5d822e
2 změnil soubory, kde provedl 4 přidání a 4 odebrání
  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 Zobrazit soubor

@@ -100,8 +100,8 @@ public class WxCouponOrderReservationController extends BaseController {
} }
} }
if(EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){ 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 Zobrazit soubor

@@ -102,8 +102,8 @@ public class WxCouponOrderReservationController extends BaseController {
} }
} }
if(EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){ 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(),"预约单状态不支持取消确认");
} }
} }




Načítá se…
Zrušit
Uložit