|
|
|
@@ -2335,9 +2335,15 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
result.put("threeRentalStartDateYear2",incrementStartDate.substring(0,4)); |
|
|
|
result.put("threeRentalStartDateMonth2",incrementStartDate.substring(5,7)); |
|
|
|
result.put("threeRentalStartDateDay2",incrementStartDate.substring(8,10)); |
|
|
|
result.put("threeProgressivePay2",progressivePay); |
|
|
|
result.put("threeProgressivePayUpper2",PriceUtil.digitUppercase(Double.parseDouble(progressivePay))); |
|
|
|
result.put("threeRentPrice2",progressivePay); |
|
|
|
double threeProgressivePay2 = new BigDecimal(priceRent) |
|
|
|
.multiply(new BigDecimal(1).add(new BigDecimal(progressivePay).divide(new BigDecimal(100)))) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("threeProgressivePay2",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)))) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("threeRentPrice2",threeRentPrice2); |
|
|
|
result.put("threeRentIncreasing2",increasingProportion); |
|
|
|
|
|
|
|
}else{ |
|
|
|
|