diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 9d78812b3..86e8bf982 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -718,7 +718,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (wxRentContract != null) { WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setTenantId(wxRentContract.getTenantId()); - wxPropertyContract.setMerchantId(wxRentContract.getMerchantId()); + if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { + wxPropertyContract.setMerchantId(wxRentContract.getMerchantId()); + } else { + wxPropertyContract.setShopId(wxRentContract.getShopId()); + } List select = wxPropertyContractMapper.select(wxPropertyContract); if (select.size() > 0) { long count = select.stream().filter(propertyContract -> propertyContract.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) ||