From 43ec0b8b5b7186d6a63711ea3bf058ac8007e358 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Fri, 14 Apr 2023 11:49:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feature:=E7=89=A9=E6=96=99=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BDbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
index b0ced0ec..0d49bdc6 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
@@ -124,7 +124,7 @@
         <bind name="dataType" value="${dataType}"/>
         <include refid="baseSelect"/>
         <where>
-            <if test="encoding != null and encoding != ''">
+            <if test="zxbm != null and encoding != ''">
                 cc.encoding = #{zxbm}
             </if>
             <if test="commodityId != null and commodityId != ''" >

From cd582399003e7266d84a9bcfbc0d5653aad9e160 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Fri, 14 Apr 2023 12:14:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feature:=E7=89=A9=E6=96=99=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BDbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
index 0d49bdc6..afbca43c 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
@@ -124,7 +124,7 @@
         <bind name="dataType" value="${dataType}"/>
         <include refid="baseSelect"/>
         <where>
-            <if test="zxbm != null and encoding != ''">
+            <if test="zxbm != null and zxbm != ''">
                 cc.encoding = #{zxbm}
             </if>
             <if test="commodityId != null and commodityId != ''" >

From 646b9e907c04a02619545c95dc4c5c87bd7b7b6e Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Fri, 14 Apr 2023 12:50:37 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feature:=E7=89=A9=E6=96=99=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BDbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/GroupCommodityCodeMapper.java         |  2 +-
 .../mapper/GroupCommodityCodeMapper.xml       | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GroupCommodityCodeMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GroupCommodityCodeMapper.java
index 85cc9efa..1f263ca0 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GroupCommodityCodeMapper.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GroupCommodityCodeMapper.java
@@ -21,7 +21,7 @@ public interface GroupCommodityCodeMapper {
      */
     List<CommodityCodeEntity> queryGroupCommodityCodeList(CommodityCodeEntity commodityCodeEntity);
 
-    CommodityCodeEntity queryCommodityCodeList(CommodityCodeEntity commodityCodeEntity);
+    CommodityCodeEntity queryCommodityCodeList(@Param("commodityCodeEntity") CommodityCodeEntity commodityCodeEntity);
 
 
     /**
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
index afbca43c..4aa594b0 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
@@ -124,16 +124,15 @@
         <bind name="dataType" value="${dataType}"/>
         <include refid="baseSelect"/>
         <where>
-            <if test="zxbm != null and zxbm != ''">
-                cc.encoding = #{zxbm}
+            <if test="commodityCodeEntity.zxbm != null and commodityCodeEntity.zxbm != ''">
+                cc.encoding = #{commodityCodeEntity.zxbm}
             </if>
-            <if test="commodityId != null and commodityId != ''" >
-                cc.commodity_id = #{commodityId}
+            <if test="commodityCodeEntity.commodityId != null and commodityCodeEntity.commodityId != ''" >
+                AND cc.commodity_id = #{commodityCodeEntity.commodityId}
             </if>
-            <if test="xhfNsrsbh != null and xhfNsrsbh != ''">
-                AND cc.xhf_nsrsbh = #{xhfNsrsbh}
+            <if test="commodityCodeEntity.xhfNsrsbh != null and commodityCodeEntity.xhfNsrsbh != ''">
+                AND cc.xhf_nsrsbh = #{commodityCodeEntity.xhfNsrsbh}
             </if>
-            ORDER BY cc.create_time DESC
         </where>
 
         ORDER BY cc.create_time DESC
@@ -399,7 +398,7 @@
         </trim>
     </insert>
     <update id="updateCommodityCode" >
-        UPDATE buyer_manage_info
+        UPDATE commodity_code
         <set>
             <if test="commodityId != null">
                 commodity_id = #{commodityId},
@@ -455,8 +454,12 @@
             <if test="userId != null">
                 user_id = #{userId},
             </if>
-            create_time,
-            modify_time,
+            <if test="createTime != null">
+                create_time = #{createTime},
+            </if>
+            <if test="modifyTime != null">
+                modify_time = #{modifyTime},
+            </if>
             <if test="modifyUserId != null">
                 modify_user_id = #{modifyUserId},
             </if>
@@ -504,7 +507,7 @@
             </if>
         </set>
         <where>
-          id = #{buyer.id,jdbcType=VARCHAR}
+          id = #{id,jdbcType=VARCHAR}
         </where>
     </update>
 

From bbcb1b6bd10ed9c3be3d396d63365c13d6f4e4bd Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Fri, 14 Apr 2023 13:43:09 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feature:=E7=89=A9=E6=96=99=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BDbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/CommodityMapper.xml          | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
index f7ff140e..aefbb6b1 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
@@ -51,7 +51,7 @@
         tax_rate, specification_model, metering_unit, unit_price, tax_logo, hide_the_logo,
         enjoy_preferential_policies, tax_class_code, tax_classification_name, preferential_policies_type,zzstsgl,
         user_id, create_time, modify_time, modify_user_id, group_id,enterprise_name,data_source,
-        matching_state,data_state,tax_class_abbreviation,description,collect_ident,cpy,bmb_bbh,jdc,wlflbm,wlflmc,ent_id,tswl
+        matching_state,data_state,tax_class_abbreviation,description,collect_ident,cpy,bmb_bbh,jdc,wlflbm,wlflmc,ent_id,tswl,invoice_name
     </sql>
 
 
@@ -357,6 +357,10 @@
             <if test="commodityCode.tswl != null">
                 tswl = #{commodityCode.tswl,jdbcType=VARCHAR},
             </if>
+            <if test="commodityCode.invoiceName != null">
+                invoice_name = #{commodityCode.invoiceName,jdbcType=VARCHAR},
+            </if>
+
         </set>
         <where>
             <if test="commodityCode.id != null and commodityCode.id != ''">
@@ -619,7 +623,7 @@
                 #{tswl,jdbcType=VARCHAR},
             </if>
             <if test="invoiceName != null">
-                invoiceName,
+                #{invoiceName,jdbcType=VARCHAR},
             </if>
         </trim>
     </insert>
@@ -740,6 +744,9 @@
             <if test="tswl != null">
                 tswl,
             </if>
+            <if test="invoiceName != null">
+                invoice_name,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -858,6 +865,9 @@
             <if test="tswl != null">
                 #{tswl,jdbcType=VARCHAR},
             </if>
+            <if test="invoiceName != null">
+                #{invoice_name,jdbcType=VARCHAR},
+            </if>
         </trim>
         ON DUPLICATE KEY UPDATE
         <trim suffixOverrides=",">
@@ -971,6 +981,9 @@
             <if test="tswl != null">
                 tswl = VALUES(tswl),
             </if>
+            <if test="invoiceName != null">
+                invoice_name = VALUES(invoice_name),
+            </if>
         </trim>
     </insert>