From b5c6f48878d834973a3f41ff2376b053e9bc217b Mon Sep 17 00:00:00 2001
From: gongquanlin <1025081659@qq.com>
Date: Wed, 15 Mar 2023 08:42:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:MDM=E5=90=8C=E6=AD=A5=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=AD=A5=E5=A4=84=E7=90=86=E7=A8=8E=E6=94=B6?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/commodity/dao/CommodityMapper.java |  12 ++
 .../mybatis/mapper/CommodityMapper.xml        | 142 ++++++++++--------
 .../dao/SdenergyTaxCodeMatchDao.java          |   8 +
 .../service/impl/SDEnregyServiceImpl.java     |  29 +++-
 .../mapper/SdenergyTaxCodeMatchDao.xml        |  11 ++
 5 files changed, 140 insertions(+), 62 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 0098229f..844f1194 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
@@ -32,6 +32,18 @@ public interface CommodityMapper {
      */
     List<CommodityCodeEntity> queryProductList(@Param("map") Map<String, String> map, @Param("shList") List<String> shList);
 
+    /**
+     * 根据项目名称匹配税收分类编码，查找一条
+     *
+     * @param xmmc
+     * @param xhfNsrsbh
+     * @return
+     */
+    CommodityCodeEntity queryByCommodityXmmc(@Param("xmmc") String xmmc, @Param("xhfNsrsbh") String xhfNsrsbh);
+
+
+    CommodityCodeEntity queryByCommodityXmmcCompany(@Param("xmmc") String xmmc);
+
     /**
      * 修改商品信息
      *
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 8e7cef07..5bf0743e 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
@@ -43,7 +43,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, commodity_id, sort_id, xhf_nsrsbh, merchandise_name,encoding, tax_items, brief_code,
+        id
+        , commodity_id, sort_id, xhf_nsrsbh, merchandise_name,encoding, tax_items, brief_code,
         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,
@@ -111,7 +112,7 @@
                     #{item}
                 </foreach>
             </if>
-               and cc.xhf_nsrsbh != '-1'
+            and cc.xhf_nsrsbh != '-1'
             <!-- 商品编码表ID-->
             <if test="map.id != null and map.id != ''">
                 AND cc.id = #{map.id,jdbcType=VARCHAR}
@@ -571,7 +572,8 @@
         </trim>
     </insert>
 
-    <insert id="insertCommodityOnDuplicateKey" parameterType="com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity">
+    <insert id="insertCommodityOnDuplicateKey"
+            parameterType="com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity">
         <bind name="dataType" value="${dataType}"/>
 
         insert into commodity_code
@@ -948,76 +950,76 @@
         </if>
     </delete>
     <select id="queryCommodityInfoList" resultMap="commodityCodeResultMap">
-            SELECT
-            <include refid="Base_Column_List"/>
-            FROM
-            commodity_code cc
-            <where>
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        commodity_code cc
+        <where>
             <if test="pageSpxxReq.dataStatus!=null and pageSpxxReq.dataStatus!=''">
                 AND cc.data_state = #{pageSpxxReq.dataStatus,jdbcType=VARCHAR}
             </if>
 
             <if test="pageSpxxReq.id!=null and pageSpxxReq.id!=''">
                 AND cc.id = #{pageSpxxReq.id,jdbcType=VARCHAR}
-                </if>
+            </if>
 
             <if test="pageSpxxReq.spId!=null and pageSpxxReq.spId!=''">
                 AND cc.commodity_id = #{pageSpxxReq.spId,jdbcType=VARCHAR}
             </if>
             <if test="pageSpxxReq.spdw!=null and pageSpxxReq.spdw!=''">
                 AND cc.metering_unit = #{pageSpxxReq.spdw,jdbcType=VARCHAR}
-                </if>
+            </if>
             <if test="pageSpxxReq.spdj!=null and pageSpxxReq.spdj!=''">
                 AND cc.unit_price = #{pageSpxxReq.spdj,jdbcType=VARCHAR}
-                </if>
+            </if>
             <if test="pageSpxxReq.sl!=null and pageSpxxReq.sl!=''">
                 AND cc.tax_rate = #{pageSpxxReq.sl,jdbcType=VARCHAR}
-                </if>
+            </if>
             <if test="pageSpxxReq.spmc!=null and pageSpxxReq.spmc!=''">
                 AND cc.merchandise_name LIKE CONCAT(CONCAT('%',#{pageSpxxReq.spmc}),'%')
             </if>
             <if test="pageSpxxReq.zxbm!=null and pageSpxxReq.zxbm!=''">
                 AND cc.encoding LIKE CONCAT(CONCAT('%',#{pageSpxxReq.zxbm}),'%')
-                </if>
+            </if>
 
             <if test="pageSpxxReq.ggxh!=null and pageSpxxReq.ggxh!=''">
                 AND cc.specification_model LIKE CONCAT(CONCAT('%',#{pageSpxxReq.ggxh}),'%')
-                </if>
-                <!-- 成品油类型 1 成品油 -->
+            </if>
+            <!-- 成品油类型 1 成品油 -->
             <if test='pageSpxxReq.cpylx=="1"'>
-                    AND cc.cpy = 'Y'
-                </if>
-                <!-- 成品油类型 0 非成品油 -->
+                AND cc.cpy = 'Y'
+            </if>
+            <!-- 成品油类型 0 非成品油 -->
             <if test='pageSpxxReq.cpylx=="0"'>
-                    AND cc.cpy = 'N'
-                </if>
-                <!-- 机动车类型 1 机动车 -->
+                AND cc.cpy = 'N'
+            </if>
+            <!-- 机动车类型 1 机动车 -->
             <if test='pageSpxxReq.jdclx=="1"'>
-                    AND cc.jdc = 'Y'
-                </if>
-                <!-- 机动车类型 0 非机动车 -->
+                AND cc.jdc = 'Y'
+            </if>
+            <!-- 机动车类型 0 非机动车 -->
             <if test='pageSpxxReq.jdclx=="0"'>
-                    AND cc.jdc = 'N'
-                </if>
+                AND cc.jdc = 'N'
+            </if>
 
-                <if test="shList != null and shList.size() == 0">
-                    and cc.xhf_nsrsbh = ''
-                </if>
-                <if test="shList != null and shList.size() == 1">
-                    and cc.xhf_nsrsbh =
-                    <foreach collection="shList" index="index" item="item">
-                        #{item}
-                    </foreach>
-                </if>
-                <if test="shList != null and shList.size() > 1">
-                    and cc.xhf_nsrsbh in
-                    <foreach collection="shList" index="index" item="item"
-                             open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </if>
-                and cc.xhf_nsrsbh != '-1'
-            </where>
+            <if test="shList != null and shList.size() == 0">
+                and cc.xhf_nsrsbh = ''
+            </if>
+            <if test="shList != null and shList.size() == 1">
+                and cc.xhf_nsrsbh =
+                <foreach collection="shList" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="shList != null and shList.size() > 1">
+                and cc.xhf_nsrsbh in
+                <foreach collection="shList" index="index" item="item"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            and cc.xhf_nsrsbh != '-1'
+        </where>
 
         limit 1000
     </select>
@@ -1070,23 +1072,23 @@
                 and commodity_id = #{commodityId,jdbcType=VARCHAR}
             </if>
 
-        <if test="shList != null and shList.size() == 0">
-            and xhf_nsrsbh = ''
-        </if>
-        <if test="shList != null and shList.size() == 1">
-            and xhf_nsrsbh =
-            <foreach collection="shList" index="index" item="item">
-                #{item}
-            </foreach>
-        </if>
-        <if test="shList != null and shList.size() > 1">
-            and xhf_nsrsbh in
-            <foreach collection="shList" index="index" item="item"
-                     open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
-        and xhf_nsrsbh != '-1'
+            <if test="shList != null and shList.size() == 0">
+                and xhf_nsrsbh = ''
+            </if>
+            <if test="shList != null and shList.size() == 1">
+                and xhf_nsrsbh =
+                <foreach collection="shList" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="shList != null and shList.size() > 1">
+                and xhf_nsrsbh in
+                <foreach collection="shList" index="index" item="item"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            and xhf_nsrsbh != '-1'
         </where>
 
     </select>
@@ -1139,6 +1141,24 @@
         and cc.xhf_nsrsbh != '-1'
     </select>
 
+    <select id="queryByCommodityXmmc" parameterType="map" resultMap="commodityCodeResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        commodity_code cc
+        WHERE cc.merchandise_name like concat("%",#{xmmc},"%")
+        and cc.xhf_nsrsbh = #{xhfNsrsbh} limit 1
+    </select>
+
+    <select id="queryByCommodityXmmcCompany" parameterType="map" resultMap="commodityCodeResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        commodity_code cc
+        WHERE cc.merchandise_name like concat("%",#{xmmc},"%")
+        and cc.xhf_nsrsbh != "-1" limit 1
+    </select>
+
 
     <!-- 通用条件查询 -->
     <select id="queryCommodityInfoListByMap" resultMap="commodityCodeResultMap">
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/dao/SdenergyTaxCodeMatchDao.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/dao/SdenergyTaxCodeMatchDao.java
index e490c3e9..17741582 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/dao/SdenergyTaxCodeMatchDao.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/dao/SdenergyTaxCodeMatchDao.java
@@ -21,6 +21,14 @@ public interface SdenergyTaxCodeMatchDao {
      */
     SdenergyTaxCodeMatch queryById(Long id);
 
+    /**
+     * 通过物料分类编码查询
+     *
+     * @param wlflbm
+     * @return
+     */
+    SdenergyTaxCodeMatch queryByWlflbm(String wlflbm);
+
     /**
      * 查询指定行数据
      *
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
index 75cd181d..679df689 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
@@ -11,6 +11,8 @@ import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
 import com.dxhy.order.baseservice.module.taxclass.dao.GroupTaxClassCodeMapper;
 import com.dxhy.order.baseservice.module.thirdservice.user.dto.AddUserRequestDto;
 import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService;
+import com.dxhy.order.consumer.modules.taxcodematch.dao.SdenergyTaxCodeMatchDao;
+import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch;
 import com.dxhy.order.consumer.openapi.protocol.AjaxResult;
 import com.dxhy.order.consumer.openapi.protocol.v6.sdenergy.*;
 import com.dxhy.order.model.R;
@@ -51,6 +53,9 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
     @Resource
     private BaseService baseService;
 
+    @Autowired
+    private SdenergyTaxCodeMatchDao sdenergyTaxCodeMatchDao;
+
     // ===========物料相关开始===========
     // 物料主动查询接口
     @Value("${mdm.groupTaxCode.url}")
@@ -188,7 +193,20 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             // entity.setDescription(reqBO.getDESCSHORT());
             // entity.setUUID(reqBO.getUUID());
             // if (groupTaxClassCodeMapper.insertOnDuplicateKey(commodityCodeEntity) <= 0) {
-            // TODO 先查找物料分类编码和税收分类编码对应的字段
+            // 先查找物料分类编码和税收分类编码对应的字段
+            // 1.先去所有子公司库中匹配税编，以第一条为准；如果未匹配到，再去根据物料编码匹配
+            CommodityCodeEntity codeEntityForMatch = commodityMapper.queryByCommodityXmmcCompany(reqBO.getDESC1());
+            if (codeEntityForMatch == null) {
+                // 2.如果未匹配到，再去根据物料编码匹配
+                SdenergyTaxCodeMatch taxCodeMatch = sdenergyTaxCodeMatchDao.queryByWlflbm(reqBO.getCATEGORYCODE());
+                if (taxCodeMatch != null) {
+                    codeEntityForMatch = new CommodityCodeEntity();
+                    codeEntityForMatch.setSsflMc(taxCodeMatch.getSsflmc());
+                    codeEntityForMatch.setSpbm(taxCodeMatch.getSsflbm());
+                }
+            }
+
+            // sdenergyTaxCodeMatchDao.queryByWlflbm(requestBody.get)
 
             commodityCodeEntity.setId(DistributedKeyMaker.generateShotKey());
             commodityCodeEntity.setSortId((long) i);
@@ -200,6 +218,15 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             commodityCodeEntity.setUUID(reqBO.getUUID());
             commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE());
             commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
+
+            // 维护税编和商品编码
+            if (codeEntityForMatch != null && StringUtils.isNotBlank(codeEntityForMatch.getSsflMc())) {
+                commodityCodeEntity.setSsflMc(codeEntityForMatch.getSsflMc());
+            }
+            if (codeEntityForMatch != null && StringUtils.isNotBlank(codeEntityForMatch.getSpbm())) {
+                commodityCodeEntity.setSpbm(codeEntityForMatch.getSpbm());
+            }
+
             commodityCodeEntity.setCommodityId(baseService.getGenerateShotKey());
             commodityCodeEntity.setXhfNsrsbh("-1");
             if (commodityMapper.insertCommodityOnDuplicateKey(commodityCodeEntity) > 0) {
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/SdenergyTaxCodeMatchDao.xml b/order-management-consumer/src/main/resources/mybatis/mapper/SdenergyTaxCodeMatchDao.xml
index ea3db77a..85172136 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/SdenergyTaxCodeMatchDao.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/SdenergyTaxCodeMatchDao.xml
@@ -22,6 +22,17 @@
         where id = #{id}
     </select>
 
+
+    <select id="queryByWlflbm" resultMap="SdenergyTaxCodeMatchMap">
+        select id,
+               wlflbm,
+               flmc,
+               ssflbm,
+               ssflmc
+        from sales_order_sdenergy.sdenergy_tax_code_match
+        where wlflbm = #{wlflbm} limit 1
+    </select>
+
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="SdenergyTaxCodeMatchMap">
         select id,