|
|
|
@@ -1100,6 +1100,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
} |
|
|
|
} else { |
|
|
|
for (int i = 1; i < size; i++) { |
|
|
|
if (EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())) { |
|
|
|
priceArrs[i] = new BigDecimal(integers.get(i)).multiply(new BigDecimal(12)).setScale(0, RoundingMode.HALF_EVEN).longValue(); |
|
|
|
continue; |
|
|
|
} |
|
|
|
if (EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { |
|
|
|
priceArrs[i] = new BigDecimal(integers.get(i)).multiply(new BigDecimal(wxRentContract.getReceivePeriod())).setScale(0, RoundingMode.HALF_EVEN).longValue(); |
|
|
|
continue; |
|
|
|
} |
|
|
|
priceArrs[i] = new BigDecimal(integers.get(i)).setScale(0, RoundingMode.HALF_EVEN).longValue(); |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -1294,15 +1302,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
}else{ |
|
|
|
Double priceD = new Double(price); |
|
|
|
if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(wxRentContract.getType())) { |
|
|
|
if (!EnumRentContractAdjustRatioWay.CUSTOM.getCode().equals(wxRentContract.getAdjustRatioWay())) { |
|
|
|
//设置跳点率为年周期 price不变 |
|
|
|
if (EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { |
|
|
|
return priceD.longValue(); |
|
|
|
} |
|
|
|
//年或者设置跳点率为年周期 除12 |
|
|
|
if (EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())) { |
|
|
|
priceD = new Double(price) / 12; |
|
|
|
} |
|
|
|
//设置跳点率为年周期 price不变 |
|
|
|
if (EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { |
|
|
|
return priceD.longValue(); |
|
|
|
} |
|
|
|
//年或者设置跳点率为年周期 除12 |
|
|
|
if (EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())) { |
|
|
|
priceD = new Double(price) / 12; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
//年 除12 |
|
|
|
|