From 8749db96edc44e76a9b2ecaf0332e8c0f34fbb5b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 14:58:59 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 a7cad1d..8e92b02 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
@@ -114,10 +114,7 @@
*/
@Override
public void waitDispersedOweFee(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date deadlineTime) {
- // todo 璐圭敤宸茬粡缁撴潫
- if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
- return;
- }
+
// todo 娓呯悊 detailId 涓�-1 鐨勬暟鎹�
PayFeeDetailMonthPo payFeeDetailMonthPo = new PayFeeDetailMonthPo();
@@ -125,6 +122,11 @@
payFeeDetailMonthPo.setFeeId(feeDto.getFeeId());
payFeeDetailMonthPo.setDetailId("-1");
payFeeDetailMonthInnerServiceSMOImpl.deletePayFeeDetailMonth(payFeeDetailMonthPo);
+
+ // todo 璐圭敤宸茬粡缁撴潫
+ if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
+ return;
+ }
List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
// todo 澶勭悊 寮�濮嬫椂闂村拰缁撴潫鏃堕棿
@@ -141,7 +143,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 +167,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);
@@ -228,8 +230,8 @@
BigDecimal receivableAmount = new BigDecimal(Double.parseDouble(feeDetailDto.getReceivableAmount()));
BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(feeDetailDto.getReceivedAmount()));
- BigDecimal dayReceivableAmount = receivableAmount.divide(new BigDecimal(day), 4, BigDecimal.ROUND_HALF_UP);// 鏃� 搴旀敹
- BigDecimal dayReceivedAmount = receivedAmount.divide(new BigDecimal(day), 4, BigDecimal.ROUND_HALF_UP);// 鏃� 瀹炴敹
+ BigDecimal dayReceivableAmount = receivableAmount.divide(new BigDecimal(day), 8, BigDecimal.ROUND_HALF_UP);// 鏃� 搴旀敹
+ BigDecimal dayReceivedAmount = receivedAmount.divide(new BigDecimal(day), 8, BigDecimal.ROUND_HALF_UP);// 鏃� 瀹炴敹
// todo 瀵绘壘绗竴涓嚜鐒舵湀 涓�鏃�
Calendar firstMonthDayCal = Calendar.getInstance();
--
Gitblit v1.8.0