From 7893cbed310e7c7a6ca1035ac5ee4b6fcaecf2a3 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 22 Aug 2019 16:19:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A6=E5=8D=95=E7=BB=93=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxRentContractServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 9695ce1e2..dd2133bf5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -278,7 +278,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { end = new BigDecimal(revenueArray[1]).divide(new BigDecimal(365), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); } if(EnumGetRatioFrom.RENT.getCode().equals(from)) { - revenue = revenue.divide(new BigDecimal(12)).setScale(10, RoundingMode.HALF_EVEN); + revenue = revenue.divide(new BigDecimal(12),10, BigDecimal.ROUND_HALF_DOWN); } }else if(EnumMissTimeType.MONTH.getCode().equals(timeType)){ if(EnumGetRatioFrom.BILL.getCode().equals(from)) { @@ -287,7 +287,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } }else if(EnumMissTimeType.PERIOD.getCode().equals(timeType)){ if(EnumGetRatioFrom.RENT.getCode().equals(from)) { - revenue = revenue.divide(new BigDecimal(period)).setScale(10, RoundingMode.HALF_EVEN);; + revenue = revenue.divide(new BigDecimal(period),10, BigDecimal.ROUND_HALF_DOWN); } } @@ -305,7 +305,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { end = new BigDecimal(revenueArray[1]).divide(new BigDecimal(365), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); } if(EnumGetRatioFrom.RENT.getCode().equals(from)) { - revenue = revenue.divide(new BigDecimal(12)).setScale(10, RoundingMode.HALF_EVEN);; + revenue = revenue.divide(new BigDecimal(12),10, BigDecimal.ROUND_HALF_DOWN); } }else if(EnumMissTimeType.MONTH.getCode().equals(timeType)){ if(EnumGetRatioFrom.BILL.getCode().equals(from)) { @@ -313,7 +313,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } }else if(EnumMissTimeType.PERIOD.getCode().equals(timeType)){ if(EnumGetRatioFrom.RENT.getCode().equals(from)) { - revenue = revenue.divide(new BigDecimal(period)).setScale(10, RoundingMode.HALF_EVEN);; + revenue = revenue.divide(new BigDecimal(period),10, BigDecimal.ROUND_HALF_DOWN); } } @@ -321,13 +321,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { ratioVo.setRatio(ratio); //计算超出部分 - BigDecimal payRatio = new BigDecimal(ratio).divide(new BigDecimal(10000)).setScale(10, RoundingMode.HALF_EVEN);; + BigDecimal payRatio = new BigDecimal(ratio).divide(new BigDecimal(10000)); BigDecimal balance = new BigDecimal(revenueLong).subtract(end.multiply(new BigDecimal(1000000))); BigDecimal price = balance.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN); array = ratioList.get(i-1).split(":"); Integer frontatio = Integer.parseInt(array[1]); - BigDecimal frontRatio = new BigDecimal(frontatio).divide(new BigDecimal(10000)).setScale(10, RoundingMode.HALF_EVEN);; + BigDecimal frontRatio = new BigDecimal(frontatio).divide(new BigDecimal(10000)); BigDecimal frontPrice = end.multiply(new BigDecimal(1000000).multiply(frontRatio).setScale(2, RoundingMode.HALF_EVEN)); ratioVo.setBalance(price.add(frontPrice));