From 47f63694c97754d5e236305d18d96048ad9cf272 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 26 May 2023 11:38:40 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E3=80=81=E6=9B=B4=E6=96=B0=E7=89=A9=E6=96=99=E8=A1=A5?= =?UTF-8?q?=E5=85=A8=E5=95=86=E5=93=81=E7=BC=96=E7=A0=81=E6=97=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=89=8D=E5=90=8E=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- .../openapi/service/impl/CommonInterfaceServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 4aed2d7e..6c702886 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 @@ -2001,9 +2001,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { StringBuilder stringBuilder = new StringBuilder(); if(StrUtil.isNotBlank(commodity.getInvoiceName())){ - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString(); + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName().trim()).toString(); }else{ - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString(); + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc().trim()).toString(); } item.setXmmc(spmc); 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 3e71a90e..6b64ad4d 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 @@ -839,9 +839,9 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { String spmc = item.getXmmc(); StringBuilder stringBuilder = new StringBuilder(); if (StringUtils.isBlank(spmc)) { - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString(); + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc().trim()).toString(); } else if (StringUtil.checkStr(spmc, commodity.getSpjc())) { - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc).toString(); + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc.trim()).toString(); } item.setXmmc(spmc); //如果税率为空使用查询到的税率否则使用原税率