feature 1.处理匹配后的规格信号超长问题

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java

@@ -823,6 +823,22 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
         if (StringUtils.isBlank(item.getSe())) {
             item.setSe("");
         }
+        //判断规格信号是否大于40位，大于则截取
+        if(StringUtils.isNotBlank(item.getGgxh())){
+            String ggxh = item.getGgxh();
+            try {
+                if (ggxh.getBytes(ConfigureConstant.STRING_CHARSET_GBK).length > ConfigureConstant.INT_40) {
+                    log.debug("对明细行规格型号进行截取,截取前数据为:{}", ggxh);
+                    ggxh = StringUtil.subStringByByte(ggxh, ConfigureConstant.INT_40);
+                    log.debug("对明细行规格型号进行截取,截取后数据为:{}", ggxh);
+                    item.setXmmc(ggxh);
+                }
+            } catch (IOException e) {
+                //编码格式错误
+                log.error("处理商品名称异常：{}", e);
+                throw new RuntimeException(e);
+            }
+        }
     }
 
     /**

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -3481,17 +3481,17 @@ public class BeanTransitionUtils {
             ddtxxBO.setKPLX(req.getZSFHZ());
             ddtxxBO.setXHFSBH(deptEntity.getInvoiceNsrsbh());
             ddtxxBO.setXHFMC(deptEntity.getInvoiceName());
-            if(OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(ddpcxxBO.getFPLXDM()) || OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(ddpcxxBO.getFPLXDM())){
-                ddtxxBO.setXHFDZ("");
-                ddtxxBO.setXHFDH("");
-                ddtxxBO.setXHFYH("");
-                ddtxxBO.setXHFZH("");
-            } else {
+//            if(OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(ddpcxxBO.getFPLXDM()) || OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(ddpcxxBO.getFPLXDM())){
+//                ddtxxBO.setXHFDZ("");
+//                ddtxxBO.setXHFDH("");
+//                ddtxxBO.setXHFYH("");
+//                ddtxxBO.setXHFZH("");
+//            } else {
                 ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress());
                 ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone());
                 ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank());
                 ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount());
-            }
+//            }
             ddtxxBO.setGMFBM(req.getZGFBH());
             ddtxxBO.setKPR(req.getZKPRXM());
             ddtxxBO.setSKR(req.getZSKRXM());