From a265ec8cc9abb4eab574f79b5fc6011879cc5f84 Mon Sep 17 00:00:00 2001
From: "zhenghaiyang@ele-cloud.com" <zhenghaiyang@ele-cloud.com>
Date: Sun, 21 May 2023 11:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CoreSaveInvoiceInfoServiceImpl.java  | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java
index b5546b8b..3af11ec6 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java
@@ -121,18 +121,24 @@ public class CoreSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<TDxRecordI
 //            invoiceStatistics.setTaxAmount(queryInvoiceResult.getBigDecimal("taxAmount"));
             String taxRate = queryInvoiceResult.getString("taxRate");
             log.info("taxRate={}",taxRate);
-            if(taxRate != null && StringUtils.isNoneBlank(taxRate)) {
+            if(StringUtils.isNotEmpty(taxRate)) {
                 if (taxRate.contains("%")) {
                     taxRate = taxRate.replace("%", "");
                 }
                 invoiceStatistics.setTaxRate(new BigDecimal(taxRate));
             }
-            try {
-                invoiceStatistics.setTaxAmount(queryInvoiceResult.getBigDecimal("taxAmount"));
-            } catch (Exception e) {
-                invoiceStatistics.setTaxAmount(new BigDecimal("0"));
+            String amount = queryInvoiceResult.getString("taxAmount");
+            if(StringUtils.isNotEmpty(amount)){
+                try {
+                    invoiceStatistics.setTaxAmount(queryInvoiceResult.getBigDecimal("taxAmount"));
+                } catch (Exception e) {
+                    invoiceStatistics.setTaxAmount(new BigDecimal("0"));
+                }
+            }
+            String resultString = queryInvoiceResult.getString("totalAmount");
+            if(StringUtils.isNotEmpty(resultString)){
+                invoiceStatistics.setTotalAmount(queryInvoiceResult.getBigDecimal("totalAmount"));
             }
-            invoiceStatistics.setTotalAmount(queryInvoiceResult.getBigDecimal("totalAmount"));
             invoiceStatisticsList.add(invoiceStatistics);
         } else {
             if (queryInvoiceResult.containsKey("detailList")) {
@@ -142,27 +148,36 @@ public class CoreSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<TDxRecordI
                     Map<String, String> slvMap = new HashMap<>(16);
                     for (int i = 0; i < dataArray.size(); i++) {
                         JSONObject invoiceDetailQuery = dataArray.getJSONObject(i);
-                        String slvPri = queryInvoiceResult.getString("invoiceCode")
-                            + queryInvoiceResult.getString("invoiceNo") + invoiceDetailQuery.getString("taxRate");
+                        String taxRate = invoiceDetailQuery.getString("taxRate");
+                        if(StringUtils.isEmpty(taxRate)){
+                            taxRate = "";
+                        }
+                        String slvPri = queryInvoiceResult.getString("invoiceCode") + queryInvoiceResult.getString("invoiceNo") + taxRate;
                         if (!slvMap.containsKey(slvPri)) {
                             slvMap.put(slvPri, slvPri);
                             TDxRecordInvoiceStatistics invoiceStatistics = new TDxRecordInvoiceStatistics();
                             invoiceStatistics.setCreateDate(DateUtils.getSqlDateLong());
                             invoiceStatistics.setInvoiceCode(queryInvoiceResult.getString("invoiceCode"));
                             invoiceStatistics.setInvoiceNo(queryInvoiceResult.getString("invoiceNo"));
-                            invoiceStatistics.setDetailAmount(invoiceDetailQuery.getBigDecimal("detailAmount"));
-                            try {
-                                invoiceStatistics.setTaxRate(invoiceDetailQuery.getBigDecimal("taxRate"));
-                            } catch (Exception e) {
-                                invoiceStatistics.setTaxRate(new BigDecimal("0"));
-                            }
-                            try {
-                                invoiceStatistics.setTaxAmount(invoiceDetailQuery.getBigDecimal("taxAmount"));
-                            } catch (Exception e) {
-                                invoiceStatistics.setTaxAmount(new BigDecimal("0"));
+                            if(StringUtils.isNotBlank(taxRate)){
+                                try {
+                                    invoiceStatistics.setTaxRate(invoiceDetailQuery.getBigDecimal("taxRate"));
+                                } catch (Exception e) {
+                                    invoiceStatistics.setTaxRate(new BigDecimal("0"));
+                                }
                             }
                             String detailAmount = invoiceDetailQuery.getString("detailAmount");
                             String taxAmount = invoiceDetailQuery.getString("taxAmount");
+                            if(StringUtils.isNotBlank(detailAmount)){
+                                invoiceStatistics.setDetailAmount(invoiceDetailQuery.getBigDecimal("detailAmount"));
+                            }
+                            if(StringUtils.isNotBlank(taxAmount)){
+                                try {
+                                    invoiceStatistics.setTaxAmount(invoiceDetailQuery.getBigDecimal("taxAmount"));
+                                } catch (Exception e) {
+                                    invoiceStatistics.setTaxAmount(new BigDecimal("0"));
+                                }
+                            }
                             if (StringUtils.isNotBlank(detailAmount) && StringUtils.isNotBlank(taxAmount)) {
                                 try {
                                     detailAmount = new BigDecimal(detailAmount).toPlainString();