winter 1 год назад
Родитель
Сommit
6a3329d151
1 измененных файлов: 4 добавлений и 4 удалений
  1. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -2625,9 +2625,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
int[] diffs = DateUtils.getDiff(startDate, realEndStart); int[] diffs = DateUtils.getDiff(startDate, realEndStart);
if (diffs[0] <= 0 ) { if (diffs[0] <= 0 ) {
if (rentcontract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode()) { if (rentcontract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode()) {
sales = sales.multiply(new BigDecimal(validDates.size())).divide(new BigDecimal(30));
sales = sales.multiply(new BigDecimal(validDates.size())).divide(new BigDecimal(30),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP);
}else { }else {
sales = sales.multiply(new BigDecimal(validDates.size())).divide(new BigDecimal(allDays));
sales = sales.multiply(new BigDecimal(validDates.size())).divide(new BigDecimal(allDays),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP);
} }
}else { }else {
Date preextraStartDay = DateUtils.getTimeAfterMonths(diffs[0], startDate); Date preextraStartDay = DateUtils.getTimeAfterMonths(diffs[0], startDate);
@@ -2635,9 +2635,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
int predays = DateUtils.daysBetween(preextraStartDay, extraStartDayMonthEnd)+1; int predays = DateUtils.daysBetween(preextraStartDay, extraStartDayMonthEnd)+1;
if (rentcontract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode()) { if (rentcontract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode()) {
BigDecimal days = new BigDecimal(diffs[0]).multiply(new BigDecimal(30)).add(new BigDecimal(predays)); BigDecimal days = new BigDecimal(diffs[0]).multiply(new BigDecimal(30)).add(new BigDecimal(predays));
sales = sales.multiply(new BigDecimal(validDates.size())).divide(days);
sales = sales.multiply(new BigDecimal(validDates.size())).divide(days,Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP);
}else { }else {
sales = sales.multiply(new BigDecimal(validDates.size())).divide(new BigDecimal(allDays));
sales = sales.multiply(new BigDecimal(validDates.size())).divide(new BigDecimal(allDays),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP);
} }
} }
} }


Загрузка…
Отмена
Сохранить