修改发票管理问题

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

@@ -83,10 +83,12 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                                 rel.setQuarterAmountExcess(new BigDecimal("300000").subtract(new BigDecimal("5000000").subtract(new BigDecimal(ord.getInvoicingAmountExcess()))).toString());
                                 rel.setSumInvoicingAmount("0");
                             } else {
-                                if (!rel.getBusinessQuality().equals("0")) {
+                                if (!rel.getBusinessQuality().equals("0")&&rel.getOuterFlag().equals("0")) {
                                     rel.setQuarterAmountExcess("300000");
+                                }
+                                rel.setSumInvoicingAmount("0");
+                                if (rel.getInvoicingAmountExcess() == null){
                                     rel.setInvoicingAmountExcess(rel.getInvoicingAmount());
-                                    rel.setSumInvoicingAmount("0");
                                 }
                             }
                             return rel;
@@ -197,10 +199,12 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                             if (ord.getInvoicingAmountExcess() != null) {
                                 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());
+                                if (!rel.getBusinessQuality().equals("0")&&rel.getOuterFlag().equals("0")) {
                                     rel.setQuarterAmountExcess("300000");
-                                    rel.setSumInvoicingAmount("0");
+                                }
+                                rel.setSumInvoicingAmount("0");
+                                if (rel.getInvoicingAmountExcess() == null){
+                                    rel.setInvoicingAmountExcess(rel.getInvoicingAmount());
                                 }
                             }
                             return rel;