submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -649,11 +649,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             add.setOperationType(oldOrg.getOperationType());
         }
         //是否总平台已存在
-        TopOldOrder oldOrder = topOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>()
-                .eq(TopOldOrder::getInputOrderSn, bo.getInputOrderSn()));
-        if (ObjectUtils.isNotNull(oldOrder)){
-            add.setOrgSign(1);
+        if (ObjectUtils.isNotNull(orderInput) && ObjectUtils.isNotNull(orderInput.getOldOrderSn())){
+            TopOldOrder oldOrder = topOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>()
+                    .eq(TopOldOrder::getOrderSn, orderInput.getOldOrderSn()));
+            if (ObjectUtils.isNotNull(oldOrder)){
+                add.setOrgSign(1);
+            }
         }
+
         //生成订单号
         String out_trade_no = DateUtils.getDateOrderSn();