Merge remote-tracking branch 'origin/dev-snyx' into test

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

@@ -202,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(processInfo.getXtly());
+        orderProcessInfo.setXtly(processInfo==null?"":processInfo.getXtly());
         commonOrderInfo.setProcessInfo(orderProcessInfo);
         commonOrderInfo.getOrderInfo().setCreateTime(new Date());
         commonOrderInfo.getOrderInfo().setUpdateTime(new Date());