From a4abb3c53f52f2c960cda9d8aa5b39f445bad957 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 20 五月 2026 18:55:37 +0800
Subject: [PATCH] update

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
index 39375a7..2c8ebb4 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -15,8 +15,6 @@
 import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO;
 import com.xiaopeng.api.dto.vehicleConvoy.BaseVehicleUserDto;
 import com.xiaopeng.api.dto.vehicleConvoy.BleInfoResponseDto;
-import com.xiaopeng.api.feignClient.account.SysGroupMenuClient;
-import com.xiaopeng.api.feignClient.frdXfipEvent.XpFrdXfipEventClient;
 import com.xiaopeng.api.feignClient.operation.XpSystemSettingClient;
 import com.xiaopeng.api.feignClient.operation.XpWhiteListClient;
 import com.xiaopeng.api.feignClient.vehicleConvoy.BluetoothUnlockClient;
@@ -42,17 +40,14 @@
 import com.xiaopeng.common.core.utils.StringUtils;
 import com.xiaopeng.common.core.utils.WebUtils;
 import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
 import com.xiaopeng.common.redis.service.RedisService;
 import com.xiaopeng.common.security.service.TokenService;
 import com.xiaopeng.order.config.BluetoothDebugConfig;
 import com.xiaopeng.order.dto.OrderNavigationDto;
 import com.xiaopeng.order.model.dto.*;
-import com.xiaopeng.api.model.order.OrderTrajectory;
-import com.xiaopeng.order.mangodb.service.OrderTrajectoryService;
-import com.xiaopeng.order.model.dto.XpOrderCommentDto;
-import com.xiaopeng.order.model.dto.XpOrderOperateDTO;
-import com.xiaopeng.order.model.dto.XpOrderPayDto;
-import com.xiaopeng.order.model.dto.XpOrderReassignDTO;
 import com.xiaopeng.order.model.exportExcel.XpOrderExportExcel;
 import com.xiaopeng.order.model.query.XpHistoryOrderListQuery;
 import com.xiaopeng.order.model.query.XpOrderExcelQuery;
@@ -171,7 +166,7 @@
      */
     @PostMapping("/logan/inner/order/has-unpay-order")
     @ApiOperation(value = "查询是否有未支付订单", tags = {"内部接口"})
-    public R<Long> hasUnPayOrder(String uid) {
+    public R<Long> hasUnPayOrder1(String uid) {
         XpOrder order = xpOrderService.getOne(new LambdaQueryWrapper<XpOrder>()
                 .eq(XpOrder::getAppUserId, Long.parseLong(uid))
                 .eq(XpOrder::getStatus, 8)
@@ -1008,8 +1003,9 @@
     @XpClientCheck(checkToken = false, checkOtpToken = true)
     public R<OrderStatusFromOrderIdVo> queryOrderStatusFromOrderId(Long orderId) {
 
-        return R.ok( xpOrderService.queryOrderStatusFromOrderId(orderId));
+        return R.ok(xpOrderService.queryOrderStatusFromOrderId(orderId));
 
+    }
 
     /**
      * 查询是否有未支付订单

--
Gitblit v1.7.1