| @@ -258,10 +258,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if(StringUtils.isBlank(busDiscountRatio)){ | if(StringUtils.isBlank(busDiscountRatio)){ | ||||
| return ratioVo; | return ratioVo; | ||||
| } | } | ||||
| BigDecimal revenue = new BigDecimal(revenueLong).divide(new BigDecimal(1000000)).setScale(4, RoundingMode.HALF_EVEN); | |||||
| List<String> ratioList = JSONArray.parseArray(busDiscountRatio, String.class); | List<String> ratioList = JSONArray.parseArray(busDiscountRatio, String.class); | ||||
| for (int i = 0; i < ratioList.size(); i++) { | 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 e = ratioList.get(i); | ||||
| String[] array = e.split(":"); | String[] array = e.split(":"); | ||||
| Integer ratio = Integer.parseInt(array[1]); | Integer ratio = Integer.parseInt(array[1]); | ||||
| @@ -388,7 +388,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| //有超出部分,在getPayRatio里计算 | //有超出部分,在getPayRatio里计算 | ||||
| record.setPrice(ratioVo.getBalance().longValue()); | record.setPrice(ratioVo.getBalance().longValue()); | ||||
| }else{ | }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里计算 | //有超出部分,在getPayRatio里计算 | ||||
| record.setPrice(ratioVo.getBalance().longValue()); | record.setPrice(ratioVo.getBalance().longValue()); | ||||
| }else{ | }else{ | ||||
| record.setPrice(countPrice(record.getPayRatio(),record.getRevenue())); | |||||
| record.setPrice(countPrice(ratioVo.getRatio(),record.getRevenue())); | |||||
| } | } | ||||
| } | } | ||||
| } else { | } else { | ||||