Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
16fea37ee7
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -484,7 +484,7 @@ public class WxRentContract extends TenantEntity {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
Long shopId = rentInfoObject.getLong("id"); Long shopId = rentInfoObject.getLong("id");
String rentArea = rentInfoObject.getString("rentArea");
String rentArea = rentInfoObject.getString("operationArea");
if (StringUtils.isBlank(rentArea)) { if (StringUtils.isBlank(rentArea)) {
shopAreaMap.put(shopId, new BigDecimal("0")); shopAreaMap.put(shopId, new BigDecimal("0"));
}else { }else {


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

@@ -362,7 +362,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillRent.setSortColumns("starttime asc"); wxBillRent.setSortColumns("starttime asc");
wxBillRent.updateTenantInfo(wxRentContract); wxBillRent.updateTenantInfo(wxRentContract);
wxBillRent.setBillType(EnumBillAllType.RENT.getCode()); wxBillRent.setBillType(EnumBillAllType.RENT.getCode());
List<WxAllBill> resultList = wxAllBillMapper.findList(wxBillRent);
List<WxAllBill> resultList = wxAllBillMapper.findContractSamePeriodSum(wxBillRent);
result.put("previewBillRentList",resultList); result.put("previewBillRentList",resultList);
return result; return result;


Loading…
Cancel
Save