From e287fa1694e2738bc4fb77cec0183499984a621d Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 25 Aug 2023 16:31:12 +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 --- .../service/impl/GenerateReadyOpenOrderServiceImpl.java | 5 +++-- .../modules/order/service/impl/OrderInfoServiceImpl.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) 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 0d068ebc..50d41ca1 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 @@ -134,6 +134,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder @Override public R reshRed(CommonOrderInfo commonOrderInfo, String uId) throws OrderSeparationException { log.info("{} 红字发票单张冲红!", LOGGER_MSG); + OrderProcessInfo processInfo = commonOrderInfo.getProcessInfo(); if (commonOrderInfo == null) { return R.setCodeAndMsg(OrderInfoContentEnum.READY_ORDER_CHECK_DATA_ERROR, null); } @@ -201,7 +202,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()); + orderProcessInfo.setXtly(processInfo.getXtly()); commonOrderInfo.setProcessInfo(orderProcessInfo); commonOrderInfo.getOrderInfo().setCreateTime(new Date()); commonOrderInfo.getOrderInfo().setUpdateTime(new Date()); @@ -652,7 +653,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder if(StringUtils.isNotBlank(commonOrderInfo.getProcessInfo().getXtly())){ orderProcessInfo.setXtly(commonOrderInfo.getProcessInfo().getXtly()); }else{ - orderProcessInfo.setXtly("FPPTEXCEL"); + orderProcessInfo.setXtly(OrderInfoEnum.SYS_SOURCE_EXCEL.getKey()); } orderProcessInfo.setBhzt(ConfigureConstant.STRING_0); orderProcessInfo.setYzfp(commonOrderInfo.getProcessInfo().getYzfp()); 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 934e1e13..effae7e2 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 @@ -1561,6 +1561,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { // 冲红生成待开单据 commonOrderInfo.setTerminalCode(terminalCode); commonOrderInfo.getOrderInfo().setSksbCode(terminalCode); + commonOrderInfo.setProcessInfo(op); R excuSingle = generateReadyOpenOrderService.reshRed(commonOrderInfo, uid); if (!excuSingle.get(OrderManagementConstant.CODE).equals(OrderInfoContentEnum.SUCCESS.getKey())) { return R.error().put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey())