| @@ -2360,15 +2360,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| result.put("threeRentalStartDateMonth2",tempAdjustRatio.substring(5,7)); | result.put("threeRentalStartDateMonth2",tempAdjustRatio.substring(5,7)); | ||||
| result.put("threeRentalStartDateDay2",tempAdjustRatio.substring(8,10)); | result.put("threeRentalStartDateDay2",tempAdjustRatio.substring(8,10)); | ||||
| double threeProgressivePay2 = new BigDecimal(priceRent) | double threeProgressivePay2 = new BigDecimal(priceRent) | ||||
| .multiply(new BigDecimal(1).add(new BigDecimal(progressivePay).divide(new BigDecimal(100)))) | |||||
| .multiply(new BigDecimal(wxRentContract.getRentArea())) | |||||
| .setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | .setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | ||||
| result.put("threeProgressivePay2",threeProgressivePay2); | result.put("threeProgressivePay2",threeProgressivePay2); | ||||
| result.put("threeProgressivePayUpper2",PriceUtil.digitUppercase(threeProgressivePay2)); | result.put("threeProgressivePayUpper2",PriceUtil.digitUppercase(threeProgressivePay2)); | ||||
| double threeRentPrice2 = new BigDecimal(wxRentContract.getRentPrice()) | |||||
| .multiply(new BigDecimal(1).add(new BigDecimal(progressivePay).divide(new BigDecimal(100)))) | |||||
| .divide(new BigDecimal(100)) | |||||
| .setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | |||||
| result.put("threeRentPrice2",threeRentPrice2); | |||||
| result.put("threeRentPrice2",progressivePay); | |||||
| result.put("threeRentIncreasing2",increasingProportion); | result.put("threeRentIncreasing2",increasingProportion); | ||||
| }else{ | }else{ | ||||