From 97df2304ef6a260abc0590800986be97f00c8e00 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Tue, 18 Apr 2023 22:59:48 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E6=8B=89?=
 =?UTF-8?q?=E5=8F=96=E6=B7=BB=E5=8A=A0=E5=8F=AA=E8=83=BD=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SDEnregyServiceImpl.java     | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

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 ad15013d..4b7d2dd8 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
@@ -134,7 +134,9 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                     structureBuyerEntity(entity,tempMdmGmfxxtbReqBO);
                     log.info("MDM编码数据已存在；{}",tempMdmGmfxxtbReqBO.getCODE());
                     //更新明细表，最好的办法是先删除后新增
-                    buyerEntityDetail.addAll(entity.getBuyerEntityDetail());
+                    if(entity.getBuyerEntityDetail() != null && entity.getBuyerEntityDetail().size() >0){
+                        buyerEntityDetail.addAll(entity.getBuyerEntityDetail());
+                    }
                     buyerManageIds.add(buyerEntity.getId());
                 }
                 buyerMapper.batchDeleteBuyerDetail(buyerManageIds);
@@ -215,6 +217,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
         buyerEntity.setCreateTime(new Date());
         buyerEntity.setModifyTime(new Date());
         // 处理开户行银行
+        List<BuyerEntityDetail> buyerEntityDetails = new ArrayList<>();
         if (tempMdmGmfxxtbReqBO.getMULTICODE() != null && !CollectionUtils.isEmpty(tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST())) {
             String buyerAddress = "";
             buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC22()) ? "" : tempMdmGmfxxtbReqBO.getDESC22());
@@ -222,7 +225,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24());
             buyerEntity.setAddress(buyerAddress);
             List<MdmGmfxxtbMulticodeValuelistBO> valuelistBOS = tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST();
-            List<BuyerEntityDetail> buyerEntityDetails = new ArrayList<>();
             if(valuelistBOS != null && valuelistBOS.size() > 0){
                 MdmGmfxxtbMulticodeValuelistBO firstValueList = valuelistBOS.get(0);
                 if (firstValueList != null) {
@@ -387,10 +389,26 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
         SdenergyTaxCodeMatch taxCodeMatch = sdenergyTaxCodeMatchDao.queryByWlflbm(commodityCodeEntity.getWlflbm());
         if (taxCodeMatch != null && StringUtils.isNotBlank(taxCodeMatch.getSsflbm())) {
             // 如果匹配到了物料分类编码，去查一下税收分类编码找到对应的简称等信息
+
+            TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(taxCodeMatch.getSsflbm());
+            commodityCodeEntity.setSpsm(taxClassCodeEntity.getSm());
+            commodityCodeEntity.setSpjm(taxClassCodeEntity.getSpjc());
+            commodityCodeEntity.setSpjc(taxClassCodeEntity.getSpjc());
+            commodityCodeEntity.setYhzcbs(taxClassCodeEntity.getZzstsgl());
+            commodityCodeEntity.setHsbz("1");
+//            commodityCodeEntity.setSl(taxClassCodeEntity.getZzssl());
+            commodityCodeEntity.setYhzcbs("0");
+            if (StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())) {
+                commodityCodeEntity.setYhzcbs("1");
+                commodityCodeEntity.setZzstsgl(taxClassCodeEntity.getYhzcmc());
+                commodityCodeEntity.setSpbm(taxClassCodeEntity.getSpbm());
+            }
+
+            commodityCodeEntity.setSsflMc(taxCodeMatch.getSsflmc());
+        }else{
             Map<String, Object> paramMap = new HashMap<>();
             paramMap.put("parameter", xmmc);
             List<TaxClassCodeEntity> taxClassCodeEntitys = taxClassCodeMapper.selectTaxClassCode(paramMap);
-            //TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(taxCodeMatch.getSsflbm());
             if(!CollectionUtils.isEmpty(taxClassCodeEntitys)){
                 TaxClassCodeEntity taxClassCodeEntity = taxClassCodeEntitys.get(0);
                 commodityCodeEntity.setSpsm(taxClassCodeEntity.getSm());
@@ -403,11 +421,9 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                 if (StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())) {
                     commodityCodeEntity.setYhzcbs("1");
                     commodityCodeEntity.setZzstsgl(taxClassCodeEntity.getYhzcmc());
+                    commodityCodeEntity.setSpbm(taxClassCodeEntity.getSpbm());
                 }
-                commodityCodeEntity.setSpbm(taxClassCodeEntity.getSpbm());
             }
-
-            commodityCodeEntity.setSsflMc(taxCodeMatch.getSsflmc());
         }
     }