From 55cb47cf8c6d85bf89daa784e627021f2d9c8896 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Tue, 13 Jun 2023 15:06:28 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E6=95=B4?=
 =?UTF-8?q?=E4=BD=93=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CommodityController.java       |  5 +++--
 .../mybatis/mapper/CommodityMapper.xml        |  3 +++
 .../mybatis/mapper/TaxClassCodeMapper.xml     |  2 +-
 .../impl/GroupCommodityCodeServiceImpl.java   | 22 ++++++++++++++++---
 .../service/impl/OrderInfoServiceImpl.java    |  2 +-
 .../openapi/api/InvoiceRestApiV6.java         | 16 +++++++-------
 .../service/impl/InterfaceServiceImplV3.java  |  1 +
 .../mapper/GroupCommodityCodeMapper.xml       | 10 ++++-----
 8 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
index 046a1881..8bb0e976 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
@@ -191,13 +191,14 @@ public class CommodityController {
         CommodityCodeEntity commodityCode = new CommodityCodeEntity();
         commodityCode.setSpjc(spjc);
         commodityCode.setSpbm(spbm);
+        commodityCode.setModifyTime(new Date());
+        commodityCode.setModifyUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null  ? userInfoService.getUser().getUserId().toString():"");
         try {
-            commodityService.batchUpdateCommodity(commodityCode,ids);
+           return commodityService.batchUpdateCommodity(commodityCode,ids);
         } catch (Exception e) {
             log.error("更新集团物料失败，异常信息{}",e);
             return R.error("系统更新异常，请联系管理员");
         }
-        return R.ok();
     }
     /**
      * 删除
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 bc66332a..3c2d73b5 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
@@ -465,6 +465,9 @@
             <if test="commodityCode.modifyTime != null and commodityCode.modifyTime != ''">
                 modify_time = #{commodityCode.modifyTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="commodityCode.modifyUserId != null and commodityCode.modifyUserId != ''">
+                modify_user_id = #{commodityCode.modifyUserId,jdbcType=CHAR},
+            </if>
             <if test="commodityCode.bz != null and commodityCode.bz != ''">
                 description = #{commodityCode.bz,jdbcType=VARCHAR},
             </if>
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml
index a824b15d..223f5656 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml
@@ -152,7 +152,7 @@
         WHERE
         tcc.spbm =#{spbm,jdbcType=VARCHAR}
         and tcc.kyzt = 'Y'
-        AND TCC.hzx = 'N'
+        AND tcc.hzx = 'N'
     </select>
 
     <select id="queryTaxClassCodeEntityBySpmcOrMs" parameterType="String"
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java
index 72175910..9ec46d55 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java
@@ -4,7 +4,9 @@ import com.dxhy.order.baseservice.module.base.service.BaseService;
 import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
 import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper;
 import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity;
+import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService;
 import com.dxhy.order.constant.ConfigureConstant;
+import com.dxhy.order.constant.TaxClassCodeEnum;
 import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper;
 import com.dxhy.order.consumer.modules.commodity.domain.dto.QueryGroupCommodityDTO;
 import com.dxhy.order.consumer.modules.commodity.domain.dto.QuoteGroupCommodityDTO;
@@ -28,6 +30,7 @@ import javax.annotation.Resource;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -54,6 +57,9 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
     @Resource
     private TaxClassCodeMapper taxClassCodeMapper;
 
+    @Resource
+    private UserInfoService userInfoService;
+
     /**
      * 查询集团物料库
      *
@@ -136,7 +142,15 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
                 log.error("{}引用物料异常", LOGGER_MSG, e);
             }
             if(queryCommodityEntity != null){
+                //如果优先级更高则不进行更新
+                if(Arrays.asList("1,2,6,7,8,10").contains(queryCommodityEntity.getDataSource())){
+                    return R.error("第" + (i + 1) + "条数据，已存在");
+                }
                 newCommodityCodeEntity.setId(queryCommodityEntity.getId());
+                newCommodityCodeEntity.setModifyTime(new Date());
+                newCommodityCodeEntity.setCreateTime(null);
+                newCommodityCodeEntity.setUserId(null);
+                newCommodityCodeEntity.setModifyUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null  ? userInfoService.getUser().getUserId().toString():"");
                 if (groupCommodityMapper.updateCommodityCode(newCommodityCodeEntity) <= 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return R.error("第" + (i + 1) + "条数据，引用失败");
@@ -144,10 +158,12 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
             }else{
                 newCommodityCodeEntity.setId(baseService.getGenerateShotKey());
                 newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh());
-                newCommodityCodeEntity.setDataState("0");
+                newCommodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_SOURCE_9.getKey());
                 newCommodityCodeEntity.setXhfMc(quoteGroupCommodityDTO.getXhfMc());
-                newCommodityCodeEntity.setHsbz("1");
-                newCommodityCodeEntity.setYhzcbs("0");
+                newCommodityCodeEntity.setHsbz(ConfigureConstant.STRING_1);
+                newCommodityCodeEntity.setYhzcbs(ConfigureConstant.STRING_0);
+                newCommodityCodeEntity.setCreateTime(new Date());
+                newCommodityCodeEntity.setUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null  ? userInfoService.getUser().getUserId().toString():"");
                 if(StringUtils.isNotBlank(newCommodityCodeEntity.getSpbm())){
                     TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.queryTaxClassCodeEntityBySpbm(newCommodityCodeEntity.getSpbm());
                     if(taxClassCodeEntity != null){
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
index d0e675be..817704d1 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
@@ -1907,7 +1907,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         for (OrderItemInfo itemInfo : orderItemInfo) {
             try {
                 CommodityCodeEntity commodityCodeEntity = buildCommodity(itemInfo, param, spbmMap);
-                //判断是否已存在
+                //判断是否已存在,同步中存在一样的是否需要过滤后期考虑
                 int i = 0;
                 //公司不维护
                 CommodityCodeEntity commodityCodeOld = collect.get(itemInfo.getZxbm());
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
index a27c874a..b72a18b6 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
@@ -254,16 +254,16 @@ public class InvoiceRestApiV6 {
 
         } else if (ConfigurerInfo.QUERYCOMMODITYINFO.equals(interfaceName)) {
             //商品信息查询接口
-            SpxxcxReqBO spxxcxReq = JsonUtils.getInstance().parseObject(reqStr, SpxxcxReqBO.class);
-            SpxxcxRspBO spxxcxRsp = interfaceServiceV3.queryCommodityMessage(spxxcxReq, secretId);
-            returnJsonString = JsonUtils.getInstance().toJsonStringNullToEmpty(spxxcxRsp);
-
+//            SpxxcxReqBO spxxcxReq = JsonUtils.getInstance().parseObject(reqStr, SpxxcxReqBO.class);
+//            SpxxcxRspBO spxxcxRsp = interfaceServiceV3.queryCommodityMessage(spxxcxReq, secretId);
+//            returnJsonString = JsonUtils.getInstance().toJsonStringNullToEmpty(spxxcxRsp);
+            return returnJsonString = "";
         } else if (ConfigurerInfo.SYNCCOMMODITYINFO.equals(interfaceName)) {
             //商品信息同步接口
-            List<SpxxtbReqBO> spxxtbReqList = JSONObject.parseArray(reqStr, SpxxtbReqBO.class);
-            List<SpxxtbRspBO> spxxtbRspList = interfaceServiceV3.syncCommodityMessage(spxxtbReqList, secretId);
-            returnJsonString = JsonUtils.getInstance().toJsonStringNullToEmpty(spxxtbRspList);
-
+//            List<SpxxtbReqBO> spxxtbReqList = JSONObject.parseArray(reqStr, SpxxtbReqBO.class);
+//            List<SpxxtbRspBO> spxxtbRspList = interfaceServiceV3.syncCommodityMessage(spxxtbReqList, secretId);
+//            returnJsonString = JsonUtils.getInstance().toJsonStringNullToEmpty(spxxtbRspList);
+            return returnJsonString = "";
         } else if (ConfigurerInfo.QUERYBUYERINFO.equals(interfaceName)) {
             //购买方信息查询接口
             GmfxxcxReqBO gmfxxcxReq = JsonUtils.getInstance().parseObject(reqStr, GmfxxcxReqBO.class);
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java
index 946242b3..f09f183c 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java
@@ -5371,6 +5371,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
      * @return
      */
     @Override
+    @SuppressWarnings("")
     public List<GroupTaxRespBO> syncGroupTax(List<GroupTaxReqBO> groupTaxReqBO, String secretId) {
         List<GroupTaxRespBO> resp = new ArrayList<GroupTaxRespBO>();
         // 根据商品名称和和商品编码查下商品编码公司是否已经录入了物料编码
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 eff72748..5f0279bf 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
@@ -569,13 +569,13 @@
            tax_classification_name,
            preferential_policies_type,
            zzstsgl,
-           user_id,
-           create_time,
-           modify_time,
-           modify_user_id,
+           'clone',
+           now(),
+           null,
+           '',
            group_id,
            #{to.xhfMc,jdbcType=VARCHAR},
-           data_source,
+           '10',
            matching_state,
            data_state,
            tax_class_abbreviation,