| @@ -409,6 +409,7 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | wxRentContract.updateTenantInfo(getTenantInfo()); | ||||
| List<Integer> statss = new ArrayList<Integer>(); | List<Integer> statss = new ArrayList<Integer>(); | ||||
| statss.add(EnumRentContractStatus.PAING.getCode()); | statss.add(EnumRentContractStatus.PAING.getCode()); | ||||
| statss.add(EnumRentContractStatus.OUT_DATE.getCode()); | |||||
| wxRentContract.setStatuss(statss); | wxRentContract.setStatuss(statss); | ||||
| wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue()); | wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue()); | ||||
| PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000); | PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000); | ||||
| @@ -42,7 +42,7 @@ public class ContractSchedule { | |||||
| //更新合同状态,正常到期 | //更新合同状态,正常到期 | ||||
| //查询计租中的合同,找到商户,然后根据商户,如果商户有到期的(租金、物业)合同,则合同状态更新为到期。 | //查询计租中的合同,找到商户,然后根据商户,如果商户有到期的(租金、物业)合同,则合同状态更新为到期。 | ||||
| //如果店铺没有有效合同,则释放店铺,不停用商户 | |||||
| //如果店铺没有有效合同,则不释放店铺,不停用商户 | |||||
| List<WxMall> wxMalls = wxMallMapper.findList(null); | List<WxMall> wxMalls = wxMallMapper.findList(null); | ||||
| for (WxMall wxMall : wxMalls) { | for (WxMall wxMall : wxMalls) { | ||||
| try { | try { | ||||
| @@ -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) { | }catch(Exception e) { | ||||
| logger.error("merchantId["+mid+"] outDateContract error.",e); | logger.error("merchantId["+mid+"] outDateContract error.",e); | ||||
| } | } | ||||