Просмотр исходного кода

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

release_toaliyun_real
lrh 2 лет назад
Родитель
Сommit
42bea2745d
1 измененных файлов: 2 добавлений и 1 удалений
  1. +2
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java

+ 2
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java Просмотреть файл

@@ -152,6 +152,7 @@ public class WxCouponOrderReservationController extends BaseController {
if(reservation.getId() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is null");
}
reservation.updateTenantInfo(getTenantInfo());
WxCouponOrderReservation sortReservation = wxCouponOrderReservationService.getSortById(reservation.getId(), reservation.getTenantId());
if(sortReservation == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error");
@@ -174,7 +175,7 @@ public class WxCouponOrderReservationController extends BaseController {
if(!EnumMerchantAdmin.REGIONAL.getCode().equals(loginMerchant.getIsAdmin())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"非区域商户,核销失败");
}
List<Long> subMerchantIds = wxMerchantRelationService.getRelationByRegionId(merchant.getId());
List<Long> subMerchantIds = wxMerchantRelationService.getRelationByRegionId(merchantId);
if(!subMerchantIds.contains(sortReservation.getReservationMerchantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"区域门店不匹配,核销失败");
}


Загрузка…
Отмена
Сохранить