From ed838e62602c0a63a64ff4bd144a0d16cc9a7cf8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 10 四月 2026 09:39:25 +0800
Subject: [PATCH] 和客户同步1.0版本
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 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 ce657b1..16e9b51 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
@@ -4,15 +4,12 @@
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.xiaopeng.api.dto.QueryOrderRouteDTO;
import com.xiaopeng.api.dto.operation.LonLatDto;
-import com.xiaopeng.api.dto.order.AddCruiseMissionDto;
import com.xiaopeng.api.dto.order.GetOrderNumDto;
import com.xiaopeng.api.dto.order.PopOrderDto;
-import com.xiaopeng.api.dto.pushMessage.SendMessageDTO;
import com.xiaopeng.api.dto.statistics.OrderStatisticsDTO;
import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
@@ -21,22 +18,19 @@
import com.xiaopeng.api.vo.automaticPilot.VehiclePosition;
import com.xiaopeng.api.vo.operation.RouteVo;
import com.xiaopeng.api.vo.order.*;
-import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
-import com.xiaopeng.common.core.enums.OrderStatusEnum;
-import com.xiaopeng.common.core.enums.PushMessageTypeEnum;
import com.xiaopeng.common.core.utils.WebUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.redis.service.RedisService;
import com.xiaopeng.order.mangodb.model.OrderTrajectory;
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;
import com.xiaopeng.order.model.query.XpOrderPageQuery;
-import com.xiaopeng.order.model.dto.XpOrderOperateDTO;
-import com.xiaopeng.order.model.dto.XpOrderReassignDTO;
import com.xiaopeng.order.model.vo.XpOrderDetailVO;
import com.xiaopeng.order.model.vo.XpOrderHistoryVO;
import com.xiaopeng.order.model.vo.XpOrderPageVO;
@@ -64,9 +58,9 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
-import java.util.*;
-
-import static org.bouncycastle.asn1.x500.style.RFC4519Style.uid;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
/**
* <p>
@@ -95,7 +89,7 @@
* @return 订单统计数据
*/
@ApiOperation(value = "获取订单统计数据", tags = {"内部接口"})
- @PostMapping("/inner/order/statistics")
+ @PostMapping("/logan/inner/order/statistics")
public R<OrderStatisticsDTO> getOrderStatistics(@RequestBody StatisticsQueryDTO query) {
return R.ok(xpOrderService.getOrderStatistics(query));
}
@@ -105,7 +99,7 @@
* 查询是否有未支付订单 或 正在进行的订单
* 返回0 可以下单 1有进行中的订单 8有待支付的
*/
- @PostMapping("/inner/order/has-unpaid-order")
+ @PostMapping("/logan/inner/order/has-unpaid-order")
@ApiOperation(value = "查询是否有未支付订单 或 正在进行的订单", tags = {"内部接口"})
public R<Long> hasUnPaodOrder(String uid) {
List<XpOrder> list = xpOrderService.list(new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getAppUserId, Long.parseLong(uid)).in(XpOrder::getStatus, Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8)));
@@ -122,12 +116,12 @@
* @param orderId 订单id
* @return 订单详情
*/
- @PostMapping("/inner/order/queryOrderById")
+ @PostMapping("/logan/inner/order/queryOrderById")
public R<XpOrder> queryOrderById(@RequestParam Long orderId) {
return R.ok(xpOrderService.getById(orderId));
}
- @PostMapping("/inner/order/queryOrderByOrderNo")
+ @PostMapping("/logan/inner/order/queryOrderByOrderNo")
public R<XpOrder> queryOrderByOrderNo(@RequestParam String orderNo) {
return R.ok(xpOrderService.getOne(new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getOrderNumber, orderNo)));
}
@@ -137,7 +131,7 @@
*
* @return 订单数量
*/
- @PostMapping("/inner/order/getOrderNum")
+ @PostMapping("/logan/inner/order/getOrderNum")
public R<Integer> getOrderNum(@RequestBody GetOrderNumDto dto) {
return R.ok(xpOrderService.getOrderNum(dto));
}
@@ -148,7 +142,7 @@
* @param cityId 开通城市ID
* @return 进行中订单数量
*/
- @GetMapping("/inner/order/countActiveOrders")
+ @GetMapping("/logan/inner/order/countActiveOrders")
public R<Integer> countActiveOrdersByCityId(@RequestParam("cityId") Long cityId) {
return R.ok(xpOrderService.countActiveOrdersByCityId(cityId));
}
@@ -157,7 +151,7 @@
/**
* 成功操作下发命令后调用 用于弹出redis队列的获取成功的数据
*/
- @PostMapping("/inner/order/popOrder")
+ @PostMapping("/logan/inner/order/popOrder")
public R<?> popOrder(@RequestBody PopOrderDto dto) {
xpOrderService.popOrder(dto);
return R.ok();
@@ -168,7 +162,7 @@
*
* @param xpOrder 订单信息
*/
- @PostMapping("/inner/order/updateOrder")
+ @PostMapping("/logan/inner/order/updateOrder")
public R<?> updateOrder(@RequestBody XpOrder xpOrder) {
xpOrder.setAppUserId(null);
return xpOrderService.updateById(xpOrder) ? R.ok() : R.fail();
@@ -181,7 +175,7 @@
* @param xpOrder 订单信息
* @return 订单ID
*/
- @PostMapping("/inner/order/addOrder")
+ @PostMapping("/logan/inner/order/addOrder")
public R<Long> addOrder(@RequestBody XpOrder xpOrder) {
boolean save = xpOrderService.addOrder(xpOrder);
if (!save) {
@@ -197,7 +191,7 @@
* @param orderId 订单ID
* @return 操作结果
*/
- @PostMapping("/inner/order/cancelOrder")
+ @PostMapping("/logan/inner/order/cancelOrder")
public R<?> cancelOrder(@RequestParam("orderId") String orderId) {
xpOrderService.cancelOrder(orderId);
return R.ok();
@@ -500,7 +494,7 @@
* 订单状态修改-车控消息推送我方调用（内部接口）
*/
@ApiOperation(value = "订单状态推送修改")
- @PostMapping("/inner/v1/order/updateOrderStatus")
+ @PostMapping("/logan/inner/v1/order/updateOrderStatus")
public R<String> updateOrderStatus(@RequestParam Long orderId,
@RequestParam Integer status) {
return xpOrderService.updateOrderStatus(orderId, status);
@@ -521,7 +515,7 @@
* 订单车辆定位实时存储-订单车辆定位实时存储（内部接口）
*/
@ApiOperation(value = "订单车辆定位实时存储")
- @PostMapping("/inner/v1/order/saveVehicleLocation")
+ @PostMapping("/logan/inner/v1/order/saveVehicleLocation")
public R<String> saveVehicleLocation(@RequestBody OrderTrajectoryVo vo) {
OrderTrajectory orderTrajectory = new OrderTrajectory();
BeanUtils.copyProperties(vo, orderTrajectory);
@@ -534,6 +528,7 @@
*/
@ApiOperation(value = "订单查询实时轨迹路线")
@PostMapping("/api/v1/mini-program/order/queryOrderRoute")
+ @XpClientCheck(checkToken = false, checkOtpToken = true)
public R<RouteVo> queryOrderRoute(@Validated @RequestBody QueryOrderRouteDTO dto, HttpServletRequest request) {
String uid = request.getHeader("XP-Uid");
// 查询订单信息
@@ -562,6 +557,7 @@
*/
@ApiOperation(value = "订单查询轨迹路线")
@GetMapping("/api/v1/mini-program/order/queryOrderTrajectory")
+ @XpClientCheck(checkToken = false, checkOtpToken = true)
public R<RouteVo> queryOrderTrajectory(@RequestParam String orderId, HttpServletRequest request) {
String uid = request.getHeader("XP-Uid");
List<OrderTrajectory> trajectories = mongoTemplate.find(
--
Gitblit v1.7.1