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 cc2b811a6..8bf390867 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -393,11 +393,20 @@ public class WxRentContractServiceImpl implements WxRentContractService { Map resultData = new HashMap(); //商铺信息 - Map shopparams = new HashMap<>(); - shopparams.put("tenantId", tenantId); - shopparams.put("status", EnumShopStatus.NOT_RENT.getCode()); - Map shopLeftInfo = wxShopMapper.queryShopLeftInfo(shopparams); - resultData.put("shopLeftInfo", shopLeftInfo); + WxShop wxShop = new WxShop(); + wxShop.setTenantId(tenantId); + wxShop.setStatus(EnumShopStatus.RENT.getCode()); + List rentedList = wxShopMapper.findList(wxShop); + wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); + List unrentedList = wxShopMapper.findList(wxShop); + + HashMap shopMap = new HashMap<>(3); + int rentedCount = rentedList.size(); + int unrentedCount = unrentedList.size(); + shopMap.put("rentedCount",rentedCount); + shopMap.put("unrentedCount",unrentedCount); + shopMap.put("allCount",rentedCount+unrentedCount); + resultData.put("shopCountInfo", shopMap); //需要更新的状态 resultData.putAll(updateStatus(tenantId)); @@ -469,6 +478,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setTenantId(tenantId); + int allCount = wxRentContractMapper.selectCount(wxRentContract); + resultData.put("allCount", allCount); + //作废合同 wxRentContract.setStatus(EnumRentContractStatus.INVALID.getCode()); wxRentContractMapper.updateRentInvalidStatus(wxRentContract);