Просмотр исходного кода

[物业合同][修改][租赁绑定的新店铺,物业未终止此店铺时提示]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
0e1851e8e0
2 измененных файлов: 12 добавлений и 6 удалений
  1. +11
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 11
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -466,11 +466,17 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService

WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(rentContractId);
if (wxRentContract != null) {
if (wxRentContract.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) ||
wxRentContract.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) ||
wxRentContract.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) ||
wxRentContract.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) {
return new ResultData(true);
WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.setTenantId(wxRentContract.getTenantId());
wxPropertyContract.setShopId(wxRentContract.getShopId());
List<WxPropertyContract> select = wxPropertyContractMapper.select(wxPropertyContract);
if (select.size() > 0) {
long count = select.stream().filter(propertyContract -> propertyContract.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) ||
propertyContract.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) ||
propertyContract.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count();
if (count > 0) {
return new ResultData(true);
}
}
}
return new ResultData(false);


+ 1
- 1
mallinkService/src/main/resources/mapper/WxShopMapper.xml Просмотреть файл

@@ -262,7 +262,7 @@
</if>
<if test="null!=status and status==1">
and s.id not in(
SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status!=1 and status!=6 and status!=7 and merchant_id is not null
SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status!=1 and status!=5 and status!=6 and status!=7 and merchant_id is not null
)
</if>
<if test=" null != sortColumns">order by s.${sortColumns}</if>


Загрузка…
Отмена
Сохранить