From d7dacf428ffd052674c446a9906c96644c789c0b Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Thu, 25 May 2023 19:34:34 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=8F=91=E7=A5=A8=E5=BC=80?=
 =?UTF-8?q?=E5=85=B7=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E5=88=99=E6=9B=B4=E6=96=B0=E5=85=AC=E5=8F=B8=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=88=99=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/commodity/dao/CommodityMapper.java |  2 +
 .../service/impl/CommodityServiceImpl.java    | 19 +++++--
 .../mybatis/mapper/CommodityMapper.xml        | 55 +++++++++++++++++++
 3 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java
index 4f3bf7e9..784e77f3 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java
@@ -53,6 +53,8 @@ public interface CommodityMapper {
      */
     int updateCommodity(@Param("commodityCode") CommodityCodeEntity codeEntity, @Param("shList") List<String> shList);
 
+    int updateCommodityByZxbm(@Param("commodityCode") CommodityCodeEntity codeEntity, @Param("map") Map<String,String> map);
+
     int batchUpdateCommodity(@Param("commodityCode") CommodityCodeEntity codeEntity, @Param("ids") List<String> ids);
 
     /**
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
index 7a78412a..baf272eb 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
@@ -639,20 +639,27 @@ public class CommodityServiceImpl implements CommodityService {
                 log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map);
                 List<CommodityCodeEntity> commodityCodeEntityList = commodityMapper.queryProductList(map, null);
                 //R r = commodityService.checkRepeat(commodityCodeCheckQuery, NsrsbhUtils.transShListByNsrsbh(receiveSpxxReq.getXhfNsrsbh()), false);
-                if(commodityCodeEntityList.isEmpty()){
-                //if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) {
-
+                TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm());
+                CommodityCodeEntity commodityCodeEntity = null;
+                if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) {
+                    commodityCodeEntity = transCommodityCode(receiveSpxxReq, taxClassCodeEntity);
+                }
+                if(commodityCodeEntityList.isEmpty()) {
+                    //if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) {
                     /**
                      * 从缓存中取税编信息
                      *
                      */
-                    TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm());
-                    if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) {
-                        CommodityCodeEntity commodityCodeEntity = transCommodityCode(receiveSpxxReq, taxClassCodeEntity);
+                    if (commodityCodeEntity != null){
                         commodityMapper.insertCommodity(commodityCodeEntity);
                         log.debug("添加成功");
                     }
 
+                }else{
+                // TODO  简称、商品编码、规格型号、单位、优惠政策标识、零税率标识
+                    if (commodityCodeEntity != null){
+                        commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map);
+                    }
                 }
             }
         }
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 231ea25b..08a1669c 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
@@ -384,6 +384,61 @@
             </if>
         </where>
     </update>
+    <update id="updateCommodityByZxbm" parameterType="com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity">
+        <bind name="dataType" value="${dataType}"/>
+        update commodity_code
+        <set>
+            <if test="commodityCode.ggxh != null">
+                specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.xmdw != null">
+                metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.ycbz != null">
+                hide_the_logo = #{commodityCode.ycbz,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.lslbs != null">
+                preferential_policies_type = #{commodityCode.lslbs,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.yhzcbs != null">
+                enjoy_preferential_policies = #{commodityCode.yhzcbs,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.spbm != null">
+                tax_class_code = #{commodityCode.spbm,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.spjc != null">
+                tax_class_abbreviation = #{commodityCode.spjc,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.zzstsgl != null">
+                zzstsgl = #{commodityCode.zzstsgl,jdbcType=VARCHAR},
+            </if>
+            <if test="dataType == 0">
+                modify_time = now(),
+            </if>
+            <if test="dataType == 1">
+                modify_time = SYSDATE,
+            </if>
+            <if test="commodityCode.modifyUserId != null">
+                modify_user_id = #{commodityCode.modifyUserId,jdbcType=CHAR},
+            </if>
+
+            <if test="commodityCode.collectIdent != null">
+                collect_ident = #{commodityCode.collectIdent,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.cpy != null">
+                cpy = #{commodityCode.cpy,jdbcType=VARCHAR},
+            </if>
+
+        </set>
+        <where>
+            <if test="map.zxbm != null">
+                and encoding = #{map.zxbm,jdbcType=VARCHAR},
+            </if>
+            <if test="map.entId != null">
+                and ent_id = #{map.entId,jdbcType=VARCHAR},
+            </if>
+        </where>
+    </update>
     <update id="batchUpdateCommodity" parameterType="com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity">
         <bind name="dataType" value="${dataType}"/>
         update commodity_code