From 39f2d52c121097f15374749dd2c069a20bc7227c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 10 Apr 2019 10:07:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=BF=98=E5=AD=98=E5=9C=A8=E7=AD=BE=E7=BA=A6=E5=90=88=E5=90=8C?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPropertyContractServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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()) ||