From be8875a1ff53a3c4211f5304ff32073e931b6e22 Mon Sep 17 00:00:00 2001
From: WangQi <1021674882@qq.com>
Date: Tue, 13 Jun 2023 15:35:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?task4575=20PO=E9=9B=86=E6=88=90=E5=BC=80?=
=?UTF-8?q?=E7=A5=A8=E8=B4=AD=E6=96=B9=E6=B2=A1=E6=9C=89=E7=A8=8E=E5=8F=B7?=
=?UTF-8?q?=E7=9A=84=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E4=B8=BA=E4=B8=AA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/dxhy/order/consumer/utils/BeanTransitionUtils.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
index 55c4da32..f1f26777 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
@@ -2100,6 +2100,10 @@ public class BeanTransitionUtils {
if (StringUtils.isBlank(commonOrderInfo.getOrderInfo().getGhfQylx())) {
commonOrderInfo.getOrderInfo().setGhfQylx(buyerEntity.getGhfQylx());
}
+ // task4575 购方税号为空设置为个人发票
+ if (StringUtils.isBlank(buyerEntity.getTaxpayerCode())) {
+ commonOrderInfo.getOrderInfo().setGhfQylx(OrderInfoEnum.GHF_QYLX_03.getKey());
+ }
/**
* 如果购方税号为空,补全税号
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 2/2] =?UTF-8?q?task4631=20=E5=BC=80=E7=A5=A8=E7=94=B3?=
=?UTF-8?q?=E8=AF=B7=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E6=A0=A1=E9=AA=8C=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E4=BF=A1=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 @@
oi.ghf_email = #{orderInfo.ghfEmail,jdbcType=VARCHAR},
+
+ oi.ghf_qylx = #{orderInfo.ghfQylx,jdbcType=VARCHAR},
+
+
op.ghf_mc = #{orderInfo.ghfMc,jdbcType=VARCHAR},