Browse Source

fix bug

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
745b34775f
3 changed files with 7 additions and 6 deletions
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java
  3. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -409,6 +409,7 @@ public class WxRentContractController extends WxContractBaseController {
wxRentContract.updateTenantInfo(getTenantInfo());
List<Integer> statss = new ArrayList<Integer>();
statss.add(EnumRentContractStatus.PAING.getCode());
statss.add(EnumRentContractStatus.OUT_DATE.getCode());
wxRentContract.setStatuss(statss);
wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue());
PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000);


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java View File

@@ -42,7 +42,7 @@ public class ContractSchedule {
//更新合同状态,正常到期
//查询计租中的合同,找到商户,然后根据商户,如果商户有到期的(租金、物业)合同,则合同状态更新为到期。
//如果店铺没有有效合同,则释放店铺,不停用商户
//如果店铺没有有效合同,则释放店铺,不停用商户
List<WxMall> wxMalls = wxMallMapper.findList(null);
for (WxMall wxMall : wxMalls) {
try {


+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -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);
}


Loading…
Cancel
Save