|
|
|
@@ -263,8 +263,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
filter(c -> c.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || |
|
|
|
c.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || |
|
|
|
c.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); |
|
|
|
//解绑商铺-没有租赁合同和物业合同才可以 |
|
|
|
if (countRentContract == 0 && countPropertyContract == 0) { |
|
|
|
//解绑商铺-没有租赁合同或物业合同才可以 |
|
|
|
if (countRentContract == 0 || countPropertyContract == 0) { |
|
|
|
WxMerchantShop wxMerchantShopQuery = new WxMerchantShop(); |
|
|
|
wxMerchantShopQuery.setTenantId(wxMerchant.getTenantId()); |
|
|
|
wxMerchantShopQuery.setMerchantId(wxMerchant.getId()); |
|
|
|
|