From 0b82f909890a3f6a06aef35e40c411398bdef87b Mon Sep 17 00:00:00 2001
From: liufeilong <liufeilong@ele-cloud.com>
Date: Tue, 7 Mar 2023 16:58:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E8=AE=A2=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/order/model/OrderProcessInfo.java    |  9 ++++++
 .../mybatis/mapper/OrderProcessInfoMapper.xml | 29 ++++++++++++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java
index e045a091..bd7f7d32 100644
--- a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java
+++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java
@@ -213,6 +213,15 @@ public class OrderProcessInfo implements Serializable {
      * 是否预制发票
      */
     private String yzfp;
+    /**
+     * 原始结算单号
+     */
+    private String originDdh;
+    /**
+     * 原始订单ID
+     */
+    private String originOrderId;
+
 
 
 
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
index 83bb11fa..b9e4750a 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
@@ -50,6 +50,8 @@
         <result column="kppzh" property="kppzh" jdbcType="VARCHAR"/>
         <result column="pzgzrq" property="pzgzrq" jdbcType="TIMESTAMP"/>
         <result column="yzfp" property="yzfp" jdbcType="VARCHAR"/>
+        <result column="origin_ddh" property="originDdh" jdbcType="VARCHAR"/>
+        <result column="origin_order_id" property="originOrderId" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="selectYwlxCountResultMap" type="com.dxhy.order.consumer.modules.order.model.bo.YwlxCountBO">
@@ -85,7 +87,7 @@
         ghf_mc, ghf_nsrsbh,
         kpxm, ddcjsj, ddlx, ddzt, ddly, ywlx,ywlx_id,kpfs, sbyy, order_status, create_time,
         update_time,xhf_nsrsbh,xhf_mc,ent_id,sksbdm,fg_status,edit_status,num,check_status,check_time,
-        bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp
+        bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id
     </sql>
 
     <select id="selectOrderProcessInfoByProcessId" resultMap="BaseResultMap"
@@ -170,7 +172,7 @@
                                         sbyy, order_status, create_time,
                                         update_time, xhf_nsrsbh, xhf_mc,ent_id,sksbdm,
                                         edit_status, num, check_status, check_time,
-                                        bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp)
+                                        bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id)
         values (#{id,jdbcType=VARCHAR}, #{orderInfoId,jdbcType=VARCHAR}, #{ddqqpch,jdbcType=VARCHAR},
                 #{fpqqlsh,jdbcType=VARCHAR},
                 #{ddh,jdbcType=VARCHAR}, #{tqm,jdbcType=VARCHAR}, #{kphjje,jdbcType=VARCHAR},
@@ -187,7 +189,8 @@
                 #{xhfNsrsbh,jdbcType=VARCHAR}, #{xhfMc,jdbcType=VARCHAR}, #{entId,jdbcType=VARCHAR}, #{sksbCode,jdbcType=VARCHAR},
                 #{editStatus,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, #{checkStatus,jdbcType=VARCHAR},
                 #{checkTime,jdbcType=VARCHAR}, #{bzdh,jdbcType=VARCHAR}, #{xtly,jdbcType=VARCHAR}, #{gsdm,jdbcType=VARCHAR},
-                #{bhzt,jdbcType=VARCHAR}, #{ygxm,jdbcType=VARCHAR}, #{kppzh,jdbcType=VARCHAR}, #{pzgzrq,jdbcType=TIMESTAMP}, #{yzfp,jdbcType=VARCHAR})
+                #{bhzt,jdbcType=VARCHAR}, #{ygxm,jdbcType=VARCHAR}, #{kppzh,jdbcType=VARCHAR}, #{pzgzrq,jdbcType=TIMESTAMP},
+                #{yzfp,jdbcType=VARCHAR}, #{originDdh,jdbcType=VARCHAR}, #{originOrderId,jdbcType=VARCHAR})
     </insert>
 
     <update id="updateOrderProcessInfoByProcessId" parameterType="com.dxhy.order.model.OrderProcessInfo">
@@ -307,6 +310,12 @@
             <if test="processInfo.yzfp != null">
                 yzfp = #{processInfo.yzfp,jdbcType=VARCHAR},
             </if>
+            <if test="processInfo.originDdh != null">
+                yzfp = #{processInfo.originDdh,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.originOrderId != null">
+                yzfp = #{processInfo.originOrderId,jdbcType=VARCHAR},
+            </if>
         </set>
         <where>
             <if test="processInfo.id != null and processInfo.id != '' ">
@@ -350,7 +359,7 @@
         op.ghf_mc, op.ghf_nsrsbh,
         op.kpxm, op.ddcjsj, op.ddlx, op.ddzt, op.ddly, op.ywlx,op.ywlx_id,op.kpfs, op.sbyy, op.order_status, op.create_time,
         op.update_time,op.xhf_nsrsbh,op.ent_id,op.xhf_mc,op.fg_status,op.edit_status,num,op.check_status,op.check_time,
-        op.bzdh,op.xtly,op.gsdm,op.bhzt,op.ygxm,op.kppzh,op.pzgzrq,op.yzfp
+        op.bzdh,op.xtly,op.gsdm,op.bhzt,op.ygxm,op.kppzh,op.pzgzrq,op.yzfp,op.origin_ddh,op.origin_order_id
         from order_process_info op
         left join order_invoice_info oii on op.id = oii.order_process_info_id
 
@@ -599,6 +608,12 @@
             <if test="map.yzfp != null and map.yzfp != ''">
                 and op.yzfp = #{map.yzfp,jdbcType=VARCHAR}
             </if>
+            <if test="map.originDdh != null and map.originDdh != ''">
+                and op.origin_ddh = #{map.originDdh,jdbcType=VARCHAR}
+            </if>
+            <if test="map.originOrderId != null and map.originOrderId != ''">
+                and op.origin_order_id = #{map.originOrderId,jdbcType=VARCHAR}
+            </if>
         </where>
     </select>
 
@@ -853,6 +868,12 @@
             <if test="processInfo.yzfp != null">
                 yzfp = #{processInfo.yzfp,jdbcType=VARCHAR},
             </if>
+            <if test="processInfo.originDdh != null">
+                yzfp = #{processInfo.originDdh,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.originOrderId != null">
+                yzfp = #{processInfo.originOrderId,jdbcType=VARCHAR},
+            </if>
         </set>
         <where>
             <if test="processInfo.id != null and processInfo.id != '' ">