From 46e74eaa41053f88099009ca7187786bf050e23f Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 28 Sep 2024 20:32:35 +0800 Subject: [PATCH] fix --- .../contract/WxRentContractController.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 96746e696..d5f38f2f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -593,7 +593,17 @@ public class WxRentContractController extends WxContractBaseController { private void validShop(WxRentContract rentContract) throws Exception { //判断该合同的店铺是不是在商户的店铺的绑定关系里面 - List shopIds = wxMerchantService.getMerchantShopIds(rentContract.getMerchantId()); + List shopIds = null; + WxMerchant merchant = wxMerchantService.selectById(rentContract.getMerchantId()); + if (merchant.getIsPrivate() == EnumYesOrNo.YES.getCode()) { + WxShop shq = new WxShop(); + shq.updateTenantInfo(merchant); + shq.setQueryShopNumber(merchant.getCreateShopNumber()); + shq.setIsDel(EnumYesOrNo.NO.getCode()); + shopIds = wxShopService.getShopIds(shq); + }else { + shopIds = wxMerchantService.getMerchantShopIds(rentContract.getMerchantId()); + } if (null == shopIds) { throw new MallinkException(Result.ERROR, "该商户未绑定任何商铺。"); }