From 73d7bef961aaa344fdb22318e0bf23e27bc2b0ed Mon Sep 17 00:00:00 2001
From: WangQi <1021674882@qq.com>
Date: Wed, 14 Jun 2023 11:03:47 +0800
Subject: [PATCH] =?UTF-8?q?task4631=20=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=A0=A1=E9=AA=8C=E5=AE=A2=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consumer/modules/order/controller/BuyerController.java    | 3 +++
 .../src/main/resources/mybatis/mapper/OrderInfoMapper.xml     | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
index bab3c16b..8d2dd881 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
@@ -185,6 +185,9 @@ public class BuyerController {
                 OrderInfo orderInfo = new OrderInfo();
                 orderInfo.setGhfMc(StringUtils.isBlank(buyerEntity.getPurchaseName())?null:buyerEntity.getPurchaseName());
                 orderInfo.setGhfNsrsbh(StringUtils.isBlank(buyerEntity.getTaxpayerCode())?null:buyerEntity.getTaxpayerCode());
+                if (StringUtils.isNotBlank(orderInfo.getGhfNsrsbh())) {
+                    orderInfo.setGhfQylx(OrderInfoEnum.GHF_QYLX_04.getKey());
+                }
                 if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size() > 0 ){
                    buyerEntity.getBuyerEntityDetail().forEach(t->{
                        if("0".equals(t.getDefaultMark())){
diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml
index 8b83fe38..2524f90e 100644
--- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml
+++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml
@@ -526,6 +526,10 @@
              <if test="orderInfo.ghfEmail != null">
                  oi.ghf_email = #{orderInfo.ghfEmail,jdbcType=VARCHAR},
              </if>
+             <if test="orderInfo.ghfQylx != null">
+                 oi.ghf_qylx = #{orderInfo.ghfQylx,jdbcType=VARCHAR},
+             </if>
+
 
              <if test="orderInfo.ghfMc != null">
                  op.ghf_mc = #{orderInfo.ghfMc,jdbcType=VARCHAR},