From fbfc0184f8aef90f2209ec51ffedf7afafc32418 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Thu, 25 May 2023 15:59:40 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9Amdm=E6=8B=89=E5=8F=96=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E5=88=87=E5=89=B2?=
 =?UTF-8?q?40=E4=B8=AA=E5=AD=97=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../openapi/service/impl/SDEnregyServiceImpl.java      | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 b974788c..c6d7f70e 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
@@ -15,6 +15,7 @@ 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.dto.AddUserRequestDto;
 import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService;
+import com.dxhy.order.constant.ConfigureConstant;
 import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper;
 import com.dxhy.order.consumer.modules.taxcodematch.dao.SdenergyTaxCodeMatchDao;
 import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch;
@@ -22,7 +23,9 @@ import com.dxhy.order.consumer.openapi.protocol.AjaxResult;
 import com.dxhy.order.consumer.openapi.protocol.v6.sdenergy.*;
 import com.dxhy.order.model.R;
 import com.dxhy.order.utils.DistributedKeyMaker;
+import com.dxhy.order.utils.GbkUtil;
 import com.dxhy.order.utils.JsonUtils;
+import com.dxhy.order.utils.StringUtil;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -34,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -318,6 +322,12 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             List<CommodityCodeEntity> commodityCodeEntities = commodityMapper.queryByCommoditySpbmCompany(reqBO.getCODE());
             List<CommodityCodeEntity> collect = commodityCodeEntities.stream().filter(t -> "-1".equals(t.getXhfNsrsbh())).collect(Collectors.toList());
             String ggxh = StringUtils.isNotBlank(reqBO.getDESCSHORT())&& reqBO.getDESCSHORT().contains("_")? reqBO.getDESCSHORT().substring(reqBO.getDESCSHORT().indexOf("_") + 1) : "";
+            if(GbkUtil.getGbkLength(ggxh) > ConfigureConstant.INT_40){
+                try {
+                    ggxh = StringUtil.subStringByByte(ggxh, ConfigureConstant.INT_40);
+                } catch (IOException e) {
+                }
+            }
             if(collect != null && collect.size() > 0){
                 matchCommodityCode(commodityCodeEntity);
                 commodityCodeEntity.setXmmc(reqBO.getDESC1());