From 745b34775fd0f6a77c93fe77e22e6752230fa91c Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 8 Jan 2021 17:15:15 +0800 Subject: [PATCH] fix bug --- .../controller/contract/WxRentContractController.java | 1 + .../java/com/iformall/schedule/ContractSchedule.java | 2 +- .../service/impl/WxRentContractServiceImpl.java | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) 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 a3cf225a2..e2c34cb06 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -409,6 +409,7 @@ public class WxRentContractController extends WxContractBaseController { wxRentContract.updateTenantInfo(getTenantInfo()); List statss = new ArrayList(); statss.add(EnumRentContractStatus.PAING.getCode()); + statss.add(EnumRentContractStatus.OUT_DATE.getCode()); wxRentContract.setStatuss(statss); wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue()); PageInfo page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index 594d40c81..dc480105f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -42,7 +42,7 @@ public class ContractSchedule { //更新合同状态,正常到期 //查询计租中的合同,找到商户,然后根据商户,如果商户有到期的(租金、物业)合同,则合同状态更新为到期。 - //如果店铺没有有效合同,则释放店铺,不停用商户 + //如果店铺没有有效合同,则不释放店铺,不停用商户 List wxMalls = wxMallMapper.findList(null); for (WxMall wxMall : wxMalls) { try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 9f04c10fc..bbaf586a8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2564,11 +2564,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //释放店铺 - if (null != shopIdList && shopIdList.size() > 0) { - wxMerchantShopMapper.delShops(mid, shopIdList); - //更新商铺的状态为未出租 - wxShopMapper.updateUnRentByIds(shopIdList); - } +// if (null != shopIdList && shopIdList.size() > 0) { +// wxMerchantShopMapper.delShops(mid, shopIdList); +// //更新商铺的状态为未出租 +// wxShopMapper.updateUnRentByIds(shopIdList); +// } }catch(Exception e) { logger.error("merchantId["+mid+"] outDateContract error.",e); }