From 2f9083526efea853d28a4f54d570034fcff72977 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 29 May 2023 14:31:58 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E5=A4=84=E7=90=86=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E5=90=8E=E7=9A=84=E8=A7=84=E6=A0=BC=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E8=B6=85=E9=95=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CommonInterfaceServiceImpl.java | 16 ++++++++++++++++ .../consumer/utils/BeanTransitionUtils.java | 14 +++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index 6b64ad4d..5f4b3ac4 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/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); + } + } } /** diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 0f0c7d7f..6e4e20f7 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/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());