优化报表基础算费功能

Signed-off-by: java110 <928255095@qq.com>

java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -619,6 +619,12 @@ public class DateUtil {
         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);
+    }
+
     /**
      * 判断时间是否在时间段内
      *

service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java

@@ -186,7 +186,7 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
             return;
         }
         // 不是自然月 费用直接返回
-        if(DateUtil.getMonthDay(feeDto.getStartTime()) !=1){
+        if(DateUtil.getDay(feeDto.getStartTime()) !=1){
             return;
         }
         List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
@@ -265,7 +265,7 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
     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<>();