Merge remote-tracking branch 'origin/release' into release

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>
 

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);
 
 
     /**

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="encoding != null and encoding != ''">
+            <if test="commodityCodeEntity.zxbm != null and commodityCodeEntity.zxbm != ''">
-                cc.encoding = #{zxbm}
+                cc.encoding = #{commodityCodeEntity.zxbm}
             </if>
-            <if test="commodityId != null and commodityId != ''" >
+            <if test="commodityCodeEntity.commodityId != null and commodityCodeEntity.commodityId != ''" >
-                cc.commodity_id = #{commodityId}
+                AND cc.commodity_id = #{commodityCodeEntity.commodityId}
             </if>
-            <if test="xhfNsrsbh != null and xhfNsrsbh != ''">
+            <if test="commodityCodeEntity.xhfNsrsbh != null and commodityCodeEntity.xhfNsrsbh != ''">
-                AND cc.xhf_nsrsbh = #{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,
+            <if test="createTime != null">
-            modify_time,
+                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>