|
|
|
@@ -819,6 +819,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
}
|
|
|
|
//查询rent_info 包括 shopId
|
|
|
|
String shopIdStr = "";
|
|
|
|
BigDecimal rentArea = new BigDecimal(0);
|
|
|
|
for (int i = 0; i < size; i++) {
|
|
|
|
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
|
|
|
|
WxRentContract wxRentContractQuery = new WxRentContract();
|
|
|
|
@@ -828,6 +829,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if (shopId == null) {
|
|
|
|
return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 已删除");
|
|
|
|
}
|
|
|
|
rentArea = rentArea.add(new BigDecimal(rentInfoObject.getString("operationArea")));
|
|
|
|
wxRentContractQuery.setId(record.getId());
|
|
|
|
if (!shopList.contains(shopId)) {
|
|
|
|
shopList.add(shopId);
|
|
|
|
@@ -835,6 +837,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
}
|
|
|
|
}
|
|
|
|
setShops(record,shopList);
|
|
|
|
record.setRentArea(rentArea.toPlainString());
|
|
|
|
try {
|
|
|
|
Date tempDate = record.getRentalStartDate();
|
|
|
|
record.setRentalStartDate(oldRentStartDate);
|
|
|
|
|