From 0ed29a9b6e7cdeeea5f736d5cbe196849b4f22f7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:40:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java b/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
index acfc9b0..652e388 100644
--- a/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
+++ b/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
@@ -141,7 +141,7 @@
if (day < 1) {
day = 1;
}
- dayReceivableAmount = receivableAmount.divide(new BigDecimal(day), 4, BigDecimal.ROUND_HALF_UP);// 鏃� 搴旀敹
+ dayReceivableAmount = receivableAmount.divide(new BigDecimal(day), 8, BigDecimal.ROUND_HALF_UP);// 鏃� 搴旀敹
}
// todo 瀵绘壘绗竴涓嚜鐒舵湀 涓�鏃�
@@ -165,16 +165,16 @@
curMonthMaxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
// todo 濡傛灉涓嶆槸鏁存湀锛屽垯杞崲涓烘寜澶╄绠�
- if (curDay != curMonthMaxDay) {
+// if (curDay != curMonthMaxDay) {
//todo 鍛ㄦ湡鎬ц垂鐢� 鏃ュ簲鏀堕噸鏂扮畻
if (!FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
- dayReceivableAmount = receivableAmount.divide(new BigDecimal(curMonthMaxDay), 4, BigDecimal.ROUND_HALF_UP);// 鏃� 瀹炴敹
+ dayReceivableAmount = receivableAmount.divide(new BigDecimal(curMonthMaxDay), 8, BigDecimal.ROUND_HALF_UP);// 鏃� 瀹炴敹
}
// todo 璁＄畻 搴旀敹
curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
- } else { // todo 濡傛灉鏄暣鏈� 閭ｅ氨鎸夋湀璁＄畻锛屼互鍏� 杞崲鎴愬ぉ鍐� 涔樹互澶╂暟鍚庣殑璇樊
- curMonthReceivableAmount = receivableAmount;
- }
+// } else { // todo 濡傛灉鏄暣鏈� 閭ｅ氨鎸夋湀璁＄畻锛屼互鍏� 杞崲鎴愬ぉ鍐� 涔樹互澶╂暟鍚庣殑璇樊
+// curMonthReceivableAmount = receivableAmount;
+// }
// todo 淇濆瓨鏁版嵁鍒皃ay_fee_detail_month
toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto, payFeeDetailMonthPos, startMonthDayTime, deadlineTime);
--
Gitblit v1.8.0