| @@ -1407,8 +1407,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| result.put("unitPriceRentUpper", PriceUtil.digitUppercase(unitPrice)); | result.put("unitPriceRentUpper", PriceUtil.digitUppercase(unitPrice)); | ||||
| } else { | } else { | ||||
| result.put("unitPriceRent", 0); | result.put("unitPriceRent", 0); | ||||
| result.put("priceRentUpper", "0"); | |||||
| result.put("unitPriceRentUpper", "0"); | |||||
| result.put("priceRentUpper", PriceUtil.digitUppercase(0)); | |||||
| result.put("unitPriceRentUpper", PriceUtil.digitUppercase(0)); | |||||
| } | } | ||||
| //租赁保证金 | //租赁保证金 | ||||
| @@ -1460,12 +1460,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| double priceProperty = new BigDecimal(wxPropertyContract.get("price").toString()) | double priceProperty = new BigDecimal(wxPropertyContract.get("price").toString()) | ||||
| .divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | .divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | ||||
| result.put("priceProperty", priceProperty); | result.put("priceProperty", priceProperty); | ||||
| double unitPriceProperty = new BigDecimal(wxPropertyContract.get("price").toString()) | |||||
| .divide(new BigDecimal(wxRentContract.getRentArea()), 2, RoundingMode.HALF_EVEN) | |||||
| .divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | |||||
| result.put("unitPriceProperty", unitPriceProperty); | |||||
| result.put("pricePropertyUpper", PriceUtil.digitUppercase(priceProperty)); | |||||
| result.put("unitPricePropertyUpper", PriceUtil.digitUppercase(unitPriceProperty)); | |||||
| if (!wxRentContract.getRentArea().equals("0")) { | |||||
| double unitPriceProperty = new BigDecimal(wxPropertyContract.get("price").toString()) | |||||
| .divide(new BigDecimal(wxRentContract.getRentArea()), 2, RoundingMode.HALF_EVEN) | |||||
| .divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | |||||
| result.put("unitPriceProperty", unitPriceProperty); | |||||
| result.put("pricePropertyUpper", PriceUtil.digitUppercase(priceProperty)); | |||||
| result.put("unitPricePropertyUpper", PriceUtil.digitUppercase(unitPriceProperty)); | |||||
| } else { | |||||
| result.put("unitPriceProperty", 0); | |||||
| result.put("pricePropertyUpper", PriceUtil.digitUppercase(0)); | |||||
| result.put("unitPricePropertyUpper", PriceUtil.digitUppercase(0)); | |||||
| } | |||||
| //首期物业费 | //首期物业费 | ||||
| Calendar instance = Calendar.getInstance(); | Calendar instance = Calendar.getInstance(); | ||||
| instance.setTime(wxRentContract.getRentalStartDate()); | instance.setTime(wxRentContract.getRentalStartDate()); | ||||