From 29b9be643d725e60d753d34932a18646ae244369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= <sci3197@dingtalk.com>
Date: Mon, 18 Dec 2023 10:55:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=85=B6=E4=B8=AD=E6=9C=89=E7=A5=A8=E6=9C=AA?=
 =?UTF-8?q?=E5=9C=A8=E8=BF=9B=E9=A1=B9=E8=A1=A8=E4=B8=AD=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ImageSubmitServiceImpl.java  | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
index b2094e70..5186c38a 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
@@ -68,19 +68,21 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
         QueryWrapper<SdnyTDxRecordInvoice> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("uuid", uuidList);
         List<SdnyTDxRecordInvoice> invoicesList = tdxRecordInvoiceDao.selectList(queryWrapper);
-        if (invoicesList == null || invoicesList.size() == 0) {
-            QueryWrapper<SdnyTDxSaleRecordInvoice> salesQueryWrapper = new QueryWrapper<>();
-            salesQueryWrapper.in("uuid", uuidList);
-            List<SdnyTDxSaleRecordInvoice> saleRecordInvoices = sdnyTDxSaleRecordInvoiceDao.selectList(salesQueryWrapper);
-            if (saleRecordInvoices == null || saleRecordInvoices.size() == 0) {
-                return R.error(500, "未查询到发票信息，请重新查验");
+        QueryWrapper<SdnyTDxSaleRecordInvoice> salesQueryWrapper = new QueryWrapper<>();
+        salesQueryWrapper.in("uuid", uuidList);
+        List<SdnyTDxSaleRecordInvoice> saleInvoices = sdnyTDxSaleRecordInvoiceDao.selectList(salesQueryWrapper);
+        if (saleInvoices!=null && saleInvoices.size()>0) {
+            if (invoicesList == null || invoicesList.size() == 0) {
+                invoicesList = new ArrayList<>();
             }
-            invoicesList = new ArrayList<>();
-            for (SdnyTDxSaleRecordInvoice item : saleRecordInvoices) {
+            for (SdnyTDxSaleRecordInvoice item : saleInvoices) {
                 SdnyTDxRecordInvoice invoice = JsonUtils.getInstance().parseObject(JSONObject.toJSONString(item), SdnyTDxRecordInvoice.class);
                 invoicesList.add(invoice);
             }
         }
+        if (invoicesList == null || invoicesList.size() == 0) {
+            return R.error(500, "未查询到发票信息，请重新查验");
+        }
         if (invoicesList.size() != uuidList.size()) {
             StringBuffer msg = new StringBuffer();
             Map<String, SdnyTDxRecordInvoice> invoiceMap = invoicesList.stream().collect(Collectors.toMap(SdnyTDxRecordInvoice::getUuid, v -> v));
@@ -97,19 +99,22 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
         QueryWrapper<SdnyTDxRecordInvoiceDetail> detailQueryWrapper = new QueryWrapper<>();
         detailQueryWrapper.in("uuid", uuidList);
         List<SdnyTDxRecordInvoiceDetail> detailList = detailDao.selectList(detailQueryWrapper);
-        if (detailList == null || detailList.size() == 0) {
-            QueryWrapper<SdnyTDxRecordInvoiceDetailSales> salesQueryWrapper = new QueryWrapper<>();
+        if (saleInvoices != null && saleInvoices.size()>0) {
+            QueryWrapper<SdnyTDxRecordInvoiceDetailSales> salesDetailQueryWrapper = new QueryWrapper<>();
             salesQueryWrapper.in("uuid", uuidList);
-            List<SdnyTDxRecordInvoiceDetailSales> salesDetailList = detailSalesDao.selectList(salesQueryWrapper);
-            if (salesDetailList == null || salesDetailList.size() == 0) {
-                return R.error(500,"未查询到发票明细信息，请重新查验");
+            List<SdnyTDxRecordInvoiceDetailSales> salesDetailList = detailSalesDao.selectList(salesDetailQueryWrapper);
+            if (detailList == null || detailList.size() == 0) {
+                detailList = new ArrayList<>();
             }
-            detailList = new ArrayList<>();
             for (SdnyTDxRecordInvoiceDetailSales item : salesDetailList) {
                 SdnyTDxRecordInvoiceDetail detail = JsonUtils.getInstance().parseObject(JSONObject.toJSONString(item), SdnyTDxRecordInvoiceDetail.class);
                 detailList.add(detail);
             }
         }
+        if (detailList == null || detailList.size() == 0) {
+            return R.error(500,"未查询到发票明细信息，请重新查验");
+
+        }
         Map<String, List<SdnyTDxRecordInvoiceDetail>> detailiMap = new HashMap<>();
         detailList.stream().forEach(item -> {
             List<SdnyTDxRecordInvoiceDetail> list = null;