From d033a9ebb5e5ab0b0b8268058d0d063373e7bbfb Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 22 Aug 2019 16:47:35 +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 --- .../iformall/service/impl/WxRentContractServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 4a4f73c3b..c2bb6fa38 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -258,10 +258,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(StringUtils.isBlank(busDiscountRatio)){ return ratioVo; } - BigDecimal revenue = new BigDecimal(revenueLong).divide(new BigDecimal(1000000)).setScale(4, RoundingMode.HALF_EVEN); List ratioList = JSONArray.parseArray(busDiscountRatio, String.class); for (int i = 0; i < ratioList.size(); i++) { + BigDecimal revenue = new BigDecimal(revenueLong).divide(new BigDecimal(1000000)).setScale(4, RoundingMode.HALF_EVEN); String e = ratioList.get(i); String[] array = e.split(":"); Integer ratio = Integer.parseInt(array[1]); @@ -388,7 +388,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //有超出部分,在getPayRatio里计算 record.setPrice(ratioVo.getBalance().longValue()); }else{ - record.setPrice(countPrice(record.getPayRatio(),record.getRevenue())); + record.setPrice(countPrice(ratioVo.getRatio(),record.getRevenue())); } } } @@ -626,7 +626,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //有超出部分,在getPayRatio里计算 record.setPrice(ratioVo.getBalance().longValue()); }else{ - record.setPrice(countPrice(record.getPayRatio(),record.getRevenue())); + record.setPrice(countPrice(ratioVo.getRatio(),record.getRevenue())); } } } else {