| @@ -352,7 +352,17 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| Integer frontatio = Integer.parseInt(array[1]); | Integer frontatio = Integer.parseInt(array[1]); | ||||
| revenueArray = array[0].split("-"); | revenueArray = array[0].split("-"); | ||||
| BigDecimal frontEnd = new BigDecimal(revenueArray[1]).divide(new BigDecimal(365), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); | |||||
| BigDecimal frontEnd = new BigDecimal(0); | |||||
| if(EnumGetRatioFrom.BILL.getCode().equals(from)){ | |||||
| if(EnumMissTimeType.YEAR.getCode().equals(timeType)){ | |||||
| frontEnd = new BigDecimal(revenueArray[1]).divide(new BigDecimal(365), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); | |||||
| }else if(EnumMissTimeType.MONTH.getCode().equals(timeType)){ | |||||
| frontEnd = new BigDecimal(revenueArray[1]).divide(new BigDecimal(30), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); | |||||
| } | |||||
| }else{ | |||||
| frontEnd = new BigDecimal(revenueArray[1]); | |||||
| } | |||||
| BigDecimal frontRatio = new BigDecimal(frontatio).divide(new BigDecimal(10000)); | BigDecimal frontRatio = new BigDecimal(frontatio).divide(new BigDecimal(10000)); | ||||
| BigDecimal frontPrice = frontEnd.multiply(new BigDecimal(1000000).multiply(frontRatio).setScale(2, RoundingMode.HALF_EVEN)); | BigDecimal frontPrice = frontEnd.multiply(new BigDecimal(1000000).multiply(frontRatio).setScale(2, RoundingMode.HALF_EVEN)); | ||||