From 9e8df35bea6bba46033fc4063028780e9797ce8e Mon Sep 17 00:00:00 2001
From: WangQi <1021674882@qq.com>
Date: Wed, 21 Jun 2023 12:31:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=AD=E6=96=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E5=88=B0=E8=B7=B3=E8=BF=87=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/manager/service/impl/InvoiceServiceImpl.java        | 1 +
 .../modules/order/service/impl/OrderInfoServiceImpl.java        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
index 9edd9c22..c1914e24 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
@@ -1602,6 +1602,7 @@ public class InvoiceServiceImpl implements InvoiceService {
             if (buyerEntity != null) {
                 if (OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey().equals(buyerEntity.getCheckBankFlag())) {
                     log.info("开始校验客户信息完整");
+
                     if (StrUtil.isBlank(orderInfo.getGhfNsrsbh())) {
                         throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方纳税人识别号为空,请补全!");
                     }
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
index 9b76e2e9..05b70c91 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
@@ -269,7 +269,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         BuyerEntity buyerEntity = buyerMapper.queryBuyerInfoByGhfIdAndEntId(orderInfo.getGhfId(), orderInfo.getEntId());
         if (buyerEntity == null) {
             log.error("{}查询原始订单客户信息为空，id为：{}", LOGGER_MSG, orderProcessInfo.getOrderInfoId());
-            oderDetailInfo.setCheckBankFlag(OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey());
+            oderDetailInfo.setCheckBankFlag(OrderInfoEnum.CHECK_BANK_FLAG_NO.getKey());
         } else {
             oderDetailInfo.setCheckBankFlag(buyerEntity.getCheckBankFlag());
         }

From 8c8dc4397b611345d0b2afd35417f1ea197fee09 Mon Sep 17 00:00:00 2001
From: wangrangrang <wangrangrang7077@dingtalk.com>
Date: Wed, 21 Jun 2023 14:26:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E6=B2=B9=E6=98=8E=E7=BB=86=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/manager/service/impl/InvoiceServiceImpl.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
index d4550cd6..b53f5d5b 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
@@ -56,7 +56,6 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -182,7 +181,7 @@ public class InvoiceServiceImpl implements InvoiceService {
                 }
             }
             if(CollectionUtils.isEmpty(cpyOrderItems)||CollectionUtils.isEmpty(nocpyOrderItems)){
-                commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:nocpyOrderItems);
+                commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:cpyOrderItems);
                 commonOrderInfoList.add(commonOrderInfo);
             }else {
                 //封装成品油