From b3d1411517baca17d92dcfe3a0933cdc342b3145 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 16 五月 2026 11:52:41 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 6a08ec3..e475e00 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
@@ -166,6 +166,23 @@
}
/**
+ * 查询是否有未支付订单
+ * 返回0 可以下单，非0为未支付订单ID
+ */
+ @PostMapping("/logan/inner/order/has-unpay-order")
+ @ApiOperation(value = "查询是否有未支付订单", tags = {"内部接口"})
+ public R<Long> hasUnPayOrder(String uid) {
+ XpOrder order = xpOrderService.getOne(new LambdaQueryWrapper<XpOrder>()
+ .eq(XpOrder::getAppUserId, Long.parseLong(uid))
+ .eq(XpOrder::getStatus, 8)
+ .last("LIMIT 1"));
+ if (order != null) {
+ return R.ok(order.getId());
+ }
+ return R.ok(0L);
+ }
+
+ /**
* 通过订单id查询订单信息
*
* @param orderId 订单id
@@ -996,11 +1013,13 @@
@GetMapping("/api/v1/mini-program/order/queryOrderStatusFromOrderId")
@XpClientCheck(checkToken = false, checkOtpToken = true)
public R<OrderStatusFromOrderIdVo> queryOrderStatusFromOrderId(Long orderId) {
+
XpOrder order = xpOrderService.getById(orderId);
+
OrderStatusFromOrderIdVo orderStatusFromOrderIdVo = new OrderStatusFromOrderIdVo();
orderStatusFromOrderIdVo.setOrderId(order.getId());
orderStatusFromOrderIdVo.setStatus(order.getStatus());
- return R.ok(orderStatusFromOrderIdVo);
+ return R.ok( xpOrderService.queryOrderStatusFromOrderId(orderId));
}
--
Gitblit v1.7.1