From 0af27e113c33caf112e2b6597a46798f394ce79d Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 25 Aug 2023 16:16:07 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=86=B2=E7=BA=A2=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=B3=BB=E7=BB=9F=E6=9D=A5=E6=BA=90=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/order/constant/OrderInfoEnum.java | 1 + .../service/impl/GenerateReadyOpenOrderServiceImpl.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index 8e27b782..140f52ed 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -409,6 +409,7 @@ public enum OrderInfoEnum { SYS_SOURCE_DSXT02("DSXT02","DSXT02"), SYS_SOURCE_SNYXX("SNYXX","SNYXX"), SYS_SOURCE_S4("S4","S4"), + SYS_SOURCE_EXCEL("FPPTEXCEL","FPPTEXCEL"), /** * 订单类型（0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单;6:历史数据订单;7:发票修复数据） diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index e498084a..0d068ebc 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -201,6 +201,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_3.getKey()); orderProcessInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey()); orderProcessInfo.setYzfp(ConfigureConstant.STRING_1); + orderProcessInfo.setXtly(OrderInfoEnum.SYS_SOURCE_EXCEL.getKey()); commonOrderInfo.setProcessInfo(orderProcessInfo); commonOrderInfo.getOrderInfo().setCreateTime(new Date()); commonOrderInfo.getOrderInfo().setUpdateTime(new Date()); @@ -648,7 +649,11 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setDdly(commonOrderInfo.getProcessInfo().getDdly()); orderProcessInfo.setDdzt(commonOrderInfo.getProcessInfo().getDdzt()); orderProcessInfo.setBzdh(StrUtil.isBlank(commonOrderInfo.getProcessInfo().getBzdh())?commonOrderInfo.getOrderInfo().getBzdh():commonOrderInfo.getProcessInfo().getBzdh()); - orderProcessInfo.setXtly("FPPTEXCEL"); + if(StringUtils.isNotBlank(commonOrderInfo.getProcessInfo().getXtly())){ + orderProcessInfo.setXtly(commonOrderInfo.getProcessInfo().getXtly()); + }else{ + orderProcessInfo.setXtly("FPPTEXCEL"); + } orderProcessInfo.setBhzt(ConfigureConstant.STRING_0); orderProcessInfo.setYzfp(commonOrderInfo.getProcessInfo().getYzfp()); orderProcessInfo.setKb(orderItemInfos.get(0).getKb());