From 6a3329d151590be570b0984153c51bb3d07c8e38 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 30 Aug 2024 10:43:28 +0800 Subject: [PATCH] fix --- .../iformall/service/impl/WxRentContractServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 2809f30e9..3b37a2d8b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/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); if (diffs[0] <= 0 ) { 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 { - 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 { Date preextraStartDay = DateUtils.getTimeAfterMonths(diffs[0], startDate); @@ -2635,9 +2635,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { int predays = DateUtils.daysBetween(preextraStartDay, extraStartDayMonthEnd)+1; if (rentcontract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode()) { 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 { - 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); } } }