From 1a1fc1eff76c85a79a16724d585c1be00b3f26f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 20 五月 2026 23:39:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 10 +---------
1 files changed, 1 insertions(+), 9 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 4597b01..2c3bb05 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
@@ -16,8 +16,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;
@@ -51,12 +49,6 @@
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;
@@ -178,7 +170,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)
--
Gitblit v1.7.1