From 7f3081da3c0597cfbfc8f0fc4e342c4ceb901f6d Mon Sep 17 00:00:00 2001
From: kong <sunuping1@sina.com>
Date: 星期日, 12 四月 2026 18:04:00 +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 | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 16e9b51..7a42f8a 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
@@ -321,13 +321,16 @@
/**
* 获取用户快捷胶囊 历史 时段 终点高点
*/
- @ApiOperation(value = "获取用户快捷胶囊 历史 时段 终点高点", tags = {"小程序-获取用户快捷胶囊 历史 时段 终点高点"})
+ @ApiOperation(value = "获取首页快捷胶囊推荐站点", notes = "根据当前起点和用户近30天有效订单，按场景优先推荐目的地；无匹配时返回空数据", tags = {"小程序-首页快捷胶囊"}, response = XpPointInfoVo.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "startPointId", value = "当前首页起点站点ID", required = true, dataType = "Long", paramType = "query")
+ })
@GetMapping("/api/v1/mini-program/order/getUserQuickCapsule")
@XpClientCheck(checkToken = false, checkOtpToken = true)
- public R<XpPointInfoVo> getUserQuickCapsule(HttpServletRequest request) {
+ public R<XpPointInfoVo> getUserQuickCapsule(@RequestParam Long startPointId, HttpServletRequest request) {
// uid已通过拦截器otp校验，可以直接使用
String uid = request.getHeader("XP-Uid");
- return R.ok(xpOrderService.getUserQuickCapsule(uid));
+ return R.ok(xpOrderService.getUserQuickCapsule(uid, startPointId));
}
@@ -403,6 +406,18 @@
/**
+ * 1.0 获取待支付订单数量
+ */
+ @ApiOperation(value = "1.0 获取待支付订单数量", tags = {"小程序-1.0 获取待支付订单数量"})
+ @GetMapping("/api/v1/mini-program/order/getWaitPayOrderNum")
+ @XpClientCheck(checkToken = false, checkOtpToken = true)
+ public R<Integer> getWaitPayOrderNum(HttpServletRequest request) {
+ // uid已通过拦截器otp校验，可以直接使用
+ String uid = request.getHeader("XP-Uid");
+ return R.ok(xpOrderService.getWaitPayOrderNum(uid));
+ }
+
+ /**
* +
* 取消订单
*/
--
Gitblit v1.7.1