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 @@ -357,6 +357,10 @@ tswl = #{commodityCode.tswl,jdbcType=VARCHAR}, + + invoice_name = #{commodityCode.invoiceName,jdbcType=VARCHAR}, + + @@ -619,7 +623,7 @@ #{tswl,jdbcType=VARCHAR}, - invoiceName, + #{invoiceName,jdbcType=VARCHAR}, @@ -740,6 +744,9 @@ tswl, + + invoice_name, + @@ -858,6 +865,9 @@ #{tswl,jdbcType=VARCHAR}, + + #{invoice_name,jdbcType=VARCHAR}, + ON DUPLICATE KEY UPDATE @@ -971,6 +981,9 @@ tswl = VALUES(tswl), + + invoice_name = VALUES(invoice_name), + 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 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 b0ced0ec..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 @@ - - cc.encoding = #{zxbm} + + cc.encoding = #{commodityCodeEntity.zxbm} - - cc.commodity_id = #{commodityId} + + AND cc.commodity_id = #{commodityCodeEntity.commodityId} - - AND cc.xhf_nsrsbh = #{xhfNsrsbh} + + AND cc.xhf_nsrsbh = #{commodityCodeEntity.xhfNsrsbh} - ORDER BY cc.create_time DESC ORDER BY cc.create_time DESC @@ -399,7 +398,7 @@ - UPDATE buyer_manage_info + UPDATE commodity_code commodity_id = #{commodityId}, @@ -455,8 +454,12 @@ user_id = #{userId}, - create_time, - modify_time, + + create_time = #{createTime}, + + + modify_time = #{modifyTime}, + modify_user_id = #{modifyUserId}, @@ -504,7 +507,7 @@ - id = #{buyer.id,jdbcType=VARCHAR} + id = #{id,jdbcType=VARCHAR}