From ea238a9c6aef31a980e1bc6c883f0568b2d1527d Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 2 Jul 2023 19:12:27 +0800 Subject: [PATCH 1/2] //..hexiao --- .../iformall/controller/WxCouponOrderReservationController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java index 74b90b93a..d88f5b90f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java +++ b/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"); From dec8bed84b814266afb4b8b2ae7febfc87dafaab Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 2 Jul 2023 19:47:53 +0800 Subject: [PATCH 2/2] //..hexiao --- .../iformall/controller/WxCouponOrderReservationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java index d88f5b90f..e923bb034 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java @@ -175,7 +175,7 @@ public class WxCouponOrderReservationController extends BaseController { if(!EnumMerchantAdmin.REGIONAL.getCode().equals(loginMerchant.getIsAdmin())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"非区域商户,核销失败"); } - List subMerchantIds = wxMerchantRelationService.getRelationByRegionId(merchant.getId()); + List subMerchantIds = wxMerchantRelationService.getRelationByRegionId(merchantId); if(!subMerchantIds.contains(sortReservation.getReservationMerchantId())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"区域门店不匹配,核销失败"); }