|
|
|
@@ -280,6 +280,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
} |
|
|
|
List<String> ratioList = JSONArray.parseArray(busDiscountRatio, String.class); |
|
|
|
|
|
|
|
ratioVo.setUseRatio("["); |
|
|
|
|
|
|
|
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); |
|
|
|
@@ -314,6 +316,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if (revenue.compareTo(start) >= 0 && revenue.compareTo(end)<= 0){ |
|
|
|
ratioVo.setRatio(ratio); |
|
|
|
ratioVo.setPrice(countPrice(ratioVo.getRatio(),revenueLong,timeType,period,from)); |
|
|
|
ratioVo.setUseRatio(ratioVo.getUseRatio()+e+","); |
|
|
|
break; |
|
|
|
} |
|
|
|
}else if(e.indexOf(">") >= 0){ |
|
|
|
@@ -340,6 +343,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
if (revenue.compareTo(end) >= 0){ |
|
|
|
ratioVo.setRatio(ratio); |
|
|
|
ratioVo.setUseRatio(ratioVo.getUseRatio()+e+","); |
|
|
|
|
|
|
|
//计算超出部分 |
|
|
|
BigDecimal payRatio = new BigDecimal(ratio).divide(new BigDecimal(10000)); |
|
|
|
@@ -365,10 +369,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
BigDecimal frontPrice = frontEnd.multiply(new BigDecimal(1000000).multiply(frontRatio).setScale(2, RoundingMode.HALF_EVEN)); |
|
|
|
|
|
|
|
ratioVo.setPrice(price.add(frontPrice).longValue()); |
|
|
|
return ratioVo; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
ratioVo.setUseRatio(ratioVo.getUseRatio().substring(0,ratioVo.getUseRatio().lastIndexOf(","))+"]"); |
|
|
|
return ratioVo; |
|
|
|
} |
|
|
|
|
|
|
|
|