|
|
|
@@ -439,10 +439,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
record.setPrice("0"); |
|
|
|
}else{ |
|
|
|
if(record.getPayRatio()!=null && record.getPayRatio().intValue() > 0){ |
|
|
|
record.setPrice(countPrice(record.getDecimalSize(),record.getPayRatio(),record.getRevenue(),EnumMissTimeType.OTHER.getCode(),record.getAdjustPeriod(),EnumGetRatioFrom.RENT.getCode()).toPlainString()); |
|
|
|
record.setPrice(countPrice(Constant.default_long_decimal_size,record.getPayRatio(),record.getRevenue(),EnumMissTimeType.OTHER.getCode(),record.getAdjustPeriod(),EnumGetRatioFrom.RENT.getCode()).toPlainString()); |
|
|
|
}else{ |
|
|
|
int dayCount = record.getReceivePeriod() * 30; |
|
|
|
RatioVo ratioVo = getPayRatio(record.getDecimalSize(),EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod()); |
|
|
|
RatioVo ratioVo = getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod()); |
|
|
|
//record.setPayRatio(ratioVo.getRatio()); |
|
|
|
record.setPrice(ratioVo.getPrice()); |
|
|
|
} |
|
|
|
@@ -791,10 +791,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if(!EnumFromType.SWITCH.getCode().equals(from)){ |
|
|
|
if (record.getType() != null && record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { |
|
|
|
if(record.getPayRatio()!=null && record.getPayRatio().intValue() > 0){ |
|
|
|
record.setPrice(countPrice(record.getDecimalSize(),record.getPayRatio(),record.getRevenue(),EnumMissTimeType.OTHER.getCode(),record.getAdjustPeriod(),from).toPlainString()); |
|
|
|
record.setPrice(countPrice(Constant.default_long_decimal_size,record.getPayRatio(),record.getRevenue(),EnumMissTimeType.OTHER.getCode(),record.getAdjustPeriod(),from).toPlainString()); |
|
|
|
}else{ |
|
|
|
int dayCount = record.getReceivePeriod() * 30; |
|
|
|
RatioVo ratioVo = getPayRatio(record.getDecimalSize(),EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod()); |
|
|
|
RatioVo ratioVo = getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod()); |
|
|
|
//record.setPayRatio(ratioVo.getRatio()); |
|
|
|
record.setPrice(ratioVo.getPrice()); |
|
|
|
} |
|
|
|
|