From 993a6e6ea8ae047b9e5fffd249ae7adfcd650d3a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 17 五月 2026 11:35:44 +0800
Subject: [PATCH] 合并代码

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java
index 7c8b69b..156c870 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java
@@ -53,7 +53,6 @@
      */
     @Scheduled(cron = "0/3 * * * * ?")
     public void taskReassignPushOrder() {
-//        System.out.println("3秒执行一次");
         //从redis 获取数据 同步 处理数据
         R<List<XpOrderReassign>> r = xpOrderReassignClient.findListOrderReassign();
         if(r.getCode()==200 && !r.getData().isEmpty()){
@@ -62,7 +61,9 @@
                 //改派次数小4
                 if(!reassign.getIsComplete() && reassign.getReassignNum()<=3){
                     XpOrderReassign reassign2 = taskOrderUtil.reassignPushOrder(10, String.valueOf(reassign.getAppUserId()),reassign.getLongitude(),reassign.getLatitude(),reassign.getOrderNumber());
-                    xpOrderReassignClient.saveOrderReassign(reassign2);
+                    if(null != reassign2){
+                        xpOrderReassignClient.saveOrderReassign(reassign2);
+                    }
                 }
             }
         }

--
Gitblit v1.7.1