From c6d5c883a516577f89abc5972ed097d569245fc2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 21 三月 2026 09:00:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 9df98ec..584e57f 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
@@ -141,6 +141,17 @@
         return R.ok(xpOrderService.getOrderNum(dto));
     }
 
+    /**
+     * 查询指定城市进行中的订单数量(status=1)
+     *
+     * @param cityId 开通城市ID
+     * @return 进行中订单数量
+     */
+    @GetMapping("/inner/order/countActiveOrders")
+    public R<Integer> countActiveOrdersByCityId(@RequestParam("cityId") Long cityId) {
+        return R.ok(xpOrderService.countActiveOrdersByCityId(cityId));
+    }
+
 
     /**
      * 成功操作下发命令后调用 用于弹出redis队列的获取成功的数据

--
Gitblit v1.7.1