Merge branch 'dev-snyx' into test

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());

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -1562,6 +1562,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())