From 2bf4848433661a44c0eb4663c36a065769994895 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 21 三月 2026 15:54:51 +0800
Subject: [PATCH] 修改bug

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index de126ed..86ee427 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -663,7 +663,7 @@
                         } catch (InterruptedException e) {
                             throw new RuntimeException(e);
                         }
-                        log.info("运维人员取消订单推送订单状态消息失败:{} {} {}", stringR1.getMsg(), JSON.toJSONString(sendMessageDTO), xpOrder.getOrderNumber());
+                        log.info("运维人员取消订单推送订单状态消息失败:{} {} {}", stringR1.getMsg(), JSON.toJSONString(sendMessageDTO), order.getOrderNumber());
                     }
                 });
             }
@@ -708,7 +708,7 @@
                     } catch (InterruptedException e) {
                         throw new RuntimeException(e);
                     }
-                    log.info("运维人员取消订单推送订单状态消息失败:{} {} {}", stringR1.getMsg(), JSON.toJSONString(sendMessageDTO), xpOrder.getOrderNumber());
+                    log.info("运维人员取消订单推送订单状态消息失败:{} {} {}", stringR1.getMsg(), JSON.toJSONString(sendMessageDTO), order.getOrderNumber());
                 }
             });
         }
@@ -789,7 +789,7 @@
                     } catch (InterruptedException e) {
                         throw new RuntimeException(e);
                     }
-                    log.info("运维人员关闭订单推送订单状态消息失败:{} {} {}", stringR1.getMsg(), JSON.toJSONString(sendMessageDTO), xpOrder.getOrderNumber());
+                    log.info("运维人员关闭订单推送订单状态消息失败:{} {} {}", stringR1.getMsg(), JSON.toJSONString(sendMessageDTO), order.getOrderNumber());
                 }
             });
         }
@@ -1406,7 +1406,7 @@
                     } catch (InterruptedException e) {
                         throw new RuntimeException(e);
                     }
-                    log.info("定时任务取消订单推送订单状态消息失败:{} {} {}", stringR1.getMsg(), JSON.toJSONString(sendMessageDTO), xpOrder.getOrderNumber());
+                    log.info("定时任务取消订单推送订单状态消息失败:{} {} {}", stringR1.getMsg(), JSON.toJSONString(sendMessageDTO), order.getOrderNumber());
                 }
             });
         }
@@ -2893,16 +2893,16 @@
             XpPoint endPoint = xpPointR1.getData();
             xpOrderDetailVO.setEndParkingTimeLimit(endPoint.getParkingTimeLimit());
         }
-        // 算时间
-        if (xpOrder.getStatus() == 1) {
-            R<Integer> r = xpPricingClient.getWaitTime(new LonLatDto(xpOrder.getStartLon(), xpOrder.getStartLat()));
-            if (r.getCode() == R.SUCCESS) {
-                xpOrderDetailVO.setEstimatedTime(r.getData());
-            } else {
-                throw new RuntimeException(r.getMsg());
-            }
-
-        }
+//        // 算时间
+//        if (xpOrder.getStatus() == 1) {
+//            R<Integer> r = xpPricingClient.getWaitTime(new LonLatDto(xpOrder.getStartLon(), xpOrder.getStartLat()));
+//            if (r.getCode() == R.SUCCESS) {
+//                xpOrderDetailVO.setEstimatedTime(r.getData());
+//            } else {
+//                throw new RuntimeException(r.getMsg());
+//            }
+//
+//        }
 
         if (xpOrder.getVehicleId() != null) {
             R<XpVehicle> xpVehicleR = xpVehicleClient.queryById(xpOrder.getVehicleId());
@@ -2980,7 +2980,7 @@
                     } catch (InterruptedException e) {
                         throw new RuntimeException(e);
                     }
-                    log.info("运维人员修改订单价格推送订单状态消息失败:{} {} {}", stringR1.getMsg(), JSON.toJSONString(sendMessageDTO), xpOrder.getOrderNumber());
+                    log.info("运维人员修改订单价格推送订单状态消息失败:{} {} {}", stringR1.getMsg(), JSON.toJSONString(sendMessageDTO), order.getOrderNumber());
                 }
             });
         }

--
Gitblit v1.7.1