修改发票管理问题

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountServiceImpl.java

@@ -80,12 +80,12 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                         .findFirst()
                         .map(ord -> {
                             if (ord.getInvoicingAmountExcess() != null) {
-
                                 rel.setQuarterAmountExcess(new BigDecimal("300000").subtract(new BigDecimal("5000000").subtract(new BigDecimal(ord.getInvoicingAmountExcess()))).toString());
                                 rel.setSumInvoicingAmount("0");
                             } else {
                                 if (!rel.getBusinessQuality().equals("0")) {
                                     rel.setQuarterAmountExcess("300000");
+                                    rel.setInvoicingAmountExcess(rel.getInvoicingAmount());
                                     rel.setSumInvoicingAmount("0");
                                 }
                             }
@@ -101,9 +101,7 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                         .findFirst()
                         .map(ord -> {
                             if (ord.getSumInvoicingAmount() != null) {
-
                                 rel.setSumInvoicingAmount(new BigDecimal(rel.getSumInvoicingAmount()).add(new BigDecimal(ord.getSumInvoicingAmount())).toString());
-
                             }
                             return rel;
                         }).orElse(null)
@@ -200,7 +198,9 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                                 rel.setQuarterAmountExcess(new BigDecimal("300000").subtract(new BigDecimal("5000000").subtract(new BigDecimal(ord.getInvoicingAmountExcess()))).toString());
                             } else {
                                 if (!rel.getBusinessQuality().equals("0")) {
+                                    rel.setInvoicingAmountExcess(rel.getInvoicingAmount());
                                     rel.setQuarterAmountExcess("300000");
+                                    rel.setSumInvoicingAmount("0");
                                 }
                             }
                             return rel;

src/main/java/com/ydtech/modules/inv/utils/LocalDateTimeUtils.java

@@ -5,6 +5,7 @@ package com.ydtech.modules.inv.utils;
  * @date 2024-01-24 18:26
  */
 import java.time.*;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Date;
@@ -38,14 +39,21 @@ public class LocalDateTimeUtils {
      * 获取12月前第一天
      */
     public static LocalDateTime get12MonthsBefore() {
-        return LocalDateTime.now().minusMonths(12).with(TemporalAdjusters.firstDayOfMonth());
+        return LocalDateTime.now().minusMonths(11).with(TemporalAdjusters.firstDayOfMonth())
+                .withHour(0)
+                .withMinute(0)
+                .withSecond(0)
+                .withNano(0);
     }
 
     /**
      * 获取当前月最后一天
      */
     public static LocalDateTime getTodayLastDay() {
-        return LocalDateTime.now().with(TemporalAdjusters.lastDayOfMonth());
+        return LocalDateTime.now().with(TemporalAdjusters.lastDayOfMonth()).withHour(0)
+                .withMinute(0)
+                .withSecond(0)
+                .withNano(0);
     }