From 7115e74a69021c84c93a3fc9e65b75cea5da575e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 15 五月 2025 01:29:41 +0800
Subject: [PATCH] 优化计算基础报表
---
service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 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 c441b20..ba40790 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
@@ -97,17 +97,7 @@
Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
Double feePrice = Double.parseDouble(feePriceAll.get("feePrice").toString());
- //todo 濡傛灉鏄竴娆℃�ц垂鐢� 闄や互
-// if (!FeeDto.FEE_FLAG_ONCE.equals(feeDto.getPayerObjType())) {
-// return feePrice;
-// }
-// double maxMonth = Math.ceil(computeFeeSMOImpl.dayCompare(feeDto.getStartTime(), feeDto.getEndTime()));
-// if (maxMonth <= 0) {
-// return feePrice;
-//
-// }
-// BigDecimal feePriceDec = new BigDecimal(feePrice).divide(new BigDecimal(maxMonth), 2, BigDecimal.ROUND_HALF_UP);
-// feePrice = feePriceDec.doubleValue();
+
return feePrice;
}
@@ -159,7 +149,7 @@
* @param deadlineTime
*/
@Override
- public void waitDispersedOweFee(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date deadlineTime, double owePrice) {
+ public void waitDispersedOweFee(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date deadlineTime, double oweMonth) {
// todo 娓呯悊 detailId 涓�-1 鐨勬暟鎹�
@@ -178,7 +168,7 @@
waitDispersedOweFeeCycleNormalMonth(feeDto,payFeeMonthOwnerDto,feePrice,deadlineTime);
// 涓�娆℃�ф垨鑰呴潪鑷劧鏈堝鐞�
- waitDispersedOweFeeOnceUnNormalMonth(feeDto,payFeeMonthOwnerDto,deadlineTime,owePrice);
+ waitDispersedOweFeeOnceUnNormalMonth(feeDto,payFeeMonthOwnerDto,feePrice,deadlineTime,oweMonth);
}
@@ -272,7 +262,7 @@
* @param deadlineTime
* @param oweMonth
*/
- private void waitDispersedOweFeeOnceUnNormalMonth(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Date deadlineTime, double oweMonth) {
+ private void waitDispersedOweFeeOnceUnNormalMonth(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto,double feePrice, Date deadlineTime, double oweMonth) {
// 涓嶆槸涓�娆℃�ц垂鐢� 骞朵笖鏄� 鑷劧鏈堝氨杩斿洖
if(!FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag()) && DateUtil.getMonthDay(feeDto.getStartTime()) == 1){
@@ -283,7 +273,8 @@
Date startTime = DateUtil.timeToDate(feeDto.getEndTime());
Date endTime = DateUtil.deadTimeToDate(deadlineTime);
- BigDecimal receivableAmount = new BigDecimal(oweMonth);
+
+ BigDecimal receivableAmount = new BigDecimal(feePrice).multiply(new BigDecimal(oweMonth)).setScale(8,BigDecimal.ROUND_HALF_UP);
BigDecimal dayReceivableAmount = null;
--
Gitblit v1.8.0