修改发票管理 重构代码

src/main/java/com/ydtech/modules/inv/controller/InvAccountIncoiceController.java

@@ -86,9 +86,9 @@ public class InvAccountIncoiceController {
 
         InvAccountIncoiceResult invAccountIncoiceResult = new InvAccountIncoiceResult();
         invAccountIncoiceResult.setRecords(invAccountIncoicePage.getRecords());
-        invAccountIncoiceResult.setPages(invAccountIncoicePage.getCurrent());
+        invAccountIncoiceResult.setPages(invAccountIncoice.getPageNo());
         invAccountIncoiceResult.setTotal(invAccountIncoicePage.getTotal());
-        invAccountIncoiceResult.setSize(invAccountIncoicePage.getPages());
+        invAccountIncoiceResult.setSize(invAccountIncoice.getPageSize());
 
         List<InvAccountIncoice> records = invAccountIncoicePage.getRecords();
         invAccountIncoiceResult.setNotPayoutMoneySum("0");

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

@@ -196,14 +196,12 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                         .filter(ord -> Objects.equals(rel.getAccountId(), ord.getAccountId()))
                         .findFirst()
                         .map(ord -> {
+                            rel.setSumInvoicingAmount("0");
                             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.setSumInvoicingAmount("0");
                                 }
                             }
                             return rel;
@@ -234,7 +232,6 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                 }
                 if (invAccount.getBusinessQuality().equals("3")) {
                     invAccount.setQuarterAmountExcess(null);
-                    invAccount.setSumInvoicingAmount(null);
                     invAccount.setInvoicingAmountExcess(null);
                 }
             }