|
|
|
@@ -254,7 +254,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
* @param revenueLong |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public static Long countPrice(Integer ratio,Long revenueLong,int timeType){ |
|
|
|
public static Long countPrice(Integer ratio,Long revenueLong){ |
|
|
|
BigDecimal hundred = new BigDecimal(100); |
|
|
|
BigDecimal revenue = new BigDecimal(revenueLong == null ? 0 : revenueLong).divide(hundred); |
|
|
|
BigDecimal payRatio = new BigDecimal(ratio == null ? 0 : ratio).divide(new BigDecimal(10000)); |
|
|
|
@@ -307,7 +307,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)); |
|
|
|
ratioVo.setPrice(countPrice(ratioVo.getRatio(),revenueLong)); |
|
|
|
break; |
|
|
|
} |
|
|
|
}else if(e.indexOf(">") >= 0){ |
|
|
|
@@ -383,7 +383,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
record.setPrice(0l); |
|
|
|
}else{ |
|
|
|
if(record.getPayRatio()!=null && record.getPayRatio().intValue() > 0){ |
|
|
|
record.setPrice(countPrice(record.getPayRatio(),record.getRevenue(),EnumMissTimeType.OTHER.getCode())); |
|
|
|
record.setPrice(countPrice(record.getPayRatio(),record.getRevenue())); |
|
|
|
}else{ |
|
|
|
int dayCount = record.getReceivePeriod() * 30; |
|
|
|
RatioVo ratioVo = getPayRatio(EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod()); |
|
|
|
@@ -616,7 +616,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if(!EnumFromType.SWITCH.getCode().equals(from)){ |
|
|
|
if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { |
|
|
|
if(record.getPayRatio()!=null && record.getPayRatio().intValue() > 0){ |
|
|
|
record.setPrice(countPrice(record.getPayRatio(),record.getRevenue(),EnumMissTimeType.OTHER.getCode())); |
|
|
|
record.setPrice(countPrice(record.getPayRatio(),record.getRevenue())); |
|
|
|
}else{ |
|
|
|
int dayCount = record.getReceivePeriod() * 30; |
|
|
|
RatioVo ratioVo = getPayRatio(EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod()); |
|
|
|
|