From b1b4c1cf7cc8823fbc23e35acc9961971570b3f3 Mon Sep 17 00:00:00 2001
From: WangQi <1021674882@qq.com>
Date: Mon, 12 Jun 2023 14:55:07 +0800
Subject: [PATCH] =?UTF-8?q?task4631=E6=A0=A1=E9=AA=8C=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AE=8C=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mybatis/mapper/BuyerMapper.xml          | 2 +-
 .../modules/manager/service/impl/InvoiceServiceImpl.java       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
index 598ad172..63e2bd2a 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
@@ -1156,7 +1156,7 @@
         </where>
     </select>
     <select id="queryBuyerInfoByGhfIdAndEntId"
-            resultType="com.dxhy.order.baseservice.module.buyer.model.BuyerEntity">
+            resultMap="BaseResultMap">
 
         select * from buyer_manage_info where buyer_code=#{ghfId} and ent_id=#{entId} order by modify_time desc limit 1
 
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 42b078fa..df80e8ba 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
@@ -153,8 +153,9 @@ public class InvoiceServiceImpl implements InvoiceService {
             if (buyerEntity == null) {
                 return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!");
             }
-
+            log.info("开始校验客户信息完整，1");
             if (OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey().equals(buyerEntity.getCheckBankFlag())) {
+                log.info("开始校验客户信息完整，2");
                 if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh())) {
                     return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方纳税人识别号为空,请补全!");
                 }