| @@ -601,7 +601,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| // if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { | // if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { | ||||
| // if (record.getReceivePeriod() != null && record.getLease() != null | // if (record.getReceivePeriod() != null && record.getLease() != null | ||||
| @@ -2251,7 +2251,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| result.put("oneRentalStartDateDay2",incrementStartDate.substring(8,10)); | result.put("oneRentalStartDateDay2",incrementStartDate.substring(8,10)); | ||||
| result.put("oneRentIncreasing2",increasingProportion); | result.put("oneRentIncreasing2",increasingProportion); | ||||
| double priceRent2 = new BigDecimal(priceRent) | double priceRent2 = new BigDecimal(priceRent) | ||||
| .divide(new BigDecimal(1).add(new BigDecimal(increasingProportion))) | |||||
| .multiply(new BigDecimal(1).add(new BigDecimal(increasingProportion))) | |||||
| .setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | .setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | ||||
| result.put("oneRentalPrice2", priceRent2); | result.put("oneRentalPrice2", priceRent2); | ||||
| result.put("oneRentalPriceUpper2", PriceUtil.digitUppercase(priceRent2)); | result.put("oneRentalPriceUpper2", PriceUtil.digitUppercase(priceRent2)); | ||||