From 5c863676b014e5ae2fa601d89a83160b6e7a6c07 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 15 五月 2026 18:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
index 82e9072..1eac4a0 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
@@ -15,6 +15,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
/**
* 订单Feign客户端
*
@@ -40,6 +42,12 @@
*/
@PostMapping("/logan/inner/order/has-unpaid-order")
R<Long> hasUnPaodOrder(@RequestParam String uid);
+
+ /**
+ * 查询是否有未支付订单
+ */
+ @PostMapping("/logan/inner/order/has-unpay-order")
+ R<Long> hasUnPayOrder(@RequestParam String uid);
/**
@@ -132,7 +140,8 @@
*/
@PostMapping("/logan/inner/v1/order/updateOrderStatus")
R<String> updateOrderStatus(@RequestParam Long orderId,
- @RequestParam Integer status);
+ @RequestParam Integer status,
+ @RequestParam Boolean orderException);
/**
* 行驶中车辆异常，订单状态修改- 修改状态=7 再修改 金额-再将状态修改成8
* @param orderId
@@ -152,5 +161,29 @@
+ /**
+ * 判断用户类型
+ * @param userId
+ * @return 1=老用户，2=新用户，3=流失用户
+ */
+ @PostMapping("/logan/inner/order/determineUserType")
+ R<Integer> determineUserType(@RequestParam Long userId);
+
+ /**
+ * 获取用户订单数量
+ * @param userId
+ * @return
+ */
+ @PostMapping("/logan/inner/order/getUserOrderNum")
+ R<Long> getUserOrderNum(@RequestParam Long userId);
+
+
+ /**
+ * 判断用户类型
+ * @param userType
+ * @return 2=老用户，3=新用户，4=流失用户
+ */
+ @PostMapping("/logan/inner/order/getUserTypeIdList")
+ R<List<Long>> getUserTypeIdList(@RequestParam Integer userType);
}
--
Gitblit v1.7.1