优化报表基础算费功能

928255095 · gitee-org · commit 6eff7f8d095d · 2025-05-14T17:53:24.000Z
Signed-off-by: java110 &lt;928255095@qq.com&gt;
diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -619,6 +619,12 @@ public static int getMonth() {
         return calendar.get(Calendar.MONTH) + 1;
     }
 
+    public static int getDay(Date date) {
+        Calendar a = Calendar.getInstance();
+        a.setTime(date);
+        return a.get(Calendar.DAY_OF_MONTH);
+    }
+
     /**
      * 判断时间是否在时间段内
      *
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
@@ -186,7 +186,7 @@ private void waitDispersedOweFeeCycleNormalMonth(FeeDto feeDto, PayFeeMonthOwner
             return;
         }
         // 不是自然月 费用直接返回
-        if(DateUtil.getMonthDay(feeDto.getStartTime()) !=1){
+        if(DateUtil.getDay(feeDto.getStartTime()) !=1){
             return;
         }
         List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
@@ -265,7 +265,7 @@ private void waitDispersedOweFeeCycleNormalMonth(FeeDto feeDto, PayFeeMonthOwner
     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){
+        if(!FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag()) && DateUtil.getDay(feeDto.getStartTime()) == 1){
             return;
         }
         List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();

Original file line number	Diff line number	Diff line change
`@@ -619,6 +619,12 @@ public static int getMonth() {`
`619`	`619`	`return calendar.get(Calendar.MONTH) + 1;`
`620`	`620`	`}`
`621`	`621`
	`622`	`+ public static int getDay(Date date) {`
	`623`	`+ Calendar a = Calendar.getInstance();`
	`624`	`+ a.setTime(date);`
	`625`	`+ return a.get(Calendar.DAY_OF_MONTH);`
	`626`	`+ }`
	`627`	`+`
`622`	`628`	`/**`
`623`	`629`	`* 判断时间是否在时间段内`
`624`	`630`	`*`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ private void waitDispersedOweFeeCycleNormalMonth(FeeDto feeDto, PayFeeMonthOwner`
`186`	`186`	`return;`
`187`	`187`	`}`
`188`	`188`	`// 不是自然月费用直接返回`
`189`		`- if(DateUtil.getMonthDay(feeDto.getStartTime()) !=1){`
	`189`	`+ if(DateUtil.getDay(feeDto.getStartTime()) !=1){`
`190`	`190`	`return;`
`191`	`191`	`}`
`192`	`192`	`List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();`
`@@ -265,7 +265,7 @@ private void waitDispersedOweFeeCycleNormalMonth(FeeDto feeDto, PayFeeMonthOwner`
`265`	`265`	`private void waitDispersedOweFeeOnceUnNormalMonth(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto,double feePrice, Date deadlineTime, double oweMonth) {`
`266`	`266`
`267`	`267`	`// 不是一次性费用并且是自然月就返回`
`268`		`- if(!FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag()) && DateUtil.getMonthDay(feeDto.getStartTime()) == 1){`
	`268`	`+ if(!FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag()) && DateUtil.getDay(feeDto.getStartTime()) == 1){`
`269`	`269`	`return;`
`270`	`270`	`}`
`271`	`271`	`List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();`