From 397bd2b2c3dea9a28b55fb1c4394fd7765f24bfb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 二月 2026 16:36:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 46114b3..14e57ae 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -9,6 +9,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.xiaopeng.api.dto.account.GetUserCouponDto;
 import com.xiaopeng.api.dto.operation.LonLatDto;
+import com.xiaopeng.api.dto.order.GetOrderNumDto;
 import com.xiaopeng.api.dto.order.HistoryEndPointsDto;
 import com.xiaopeng.api.dto.order.HistoryStartPointsDto;
 import com.xiaopeng.api.dto.statistics.DailyCountDTO;
@@ -935,11 +936,20 @@
         return R.ok();
     }
 
+    /**
+     * 添加订单
+     * @param xpOrder
+     * @return
+     */
     @Override
     public boolean addOrder(XpOrder xpOrder) {
         int insert = this.baseMapper.insert(xpOrder);
+        if (insert <= 0) {
+            return false;
+        }
         return true;
     }
+
 
     @Override
     public XpVehicle queryVehicleByOrderId(Long orderId, String uid) {
@@ -948,11 +958,15 @@
         return xpVehicle;
     }
 
+    /**
+     * 获取订单数量
+     * @param dto
+     * @return
+     */
     @Override
-    public Integer getOrderNum(String timeStr) {
-        this.baseMapper.selectCount(new LambdaQueryWrapper<XpOrder>());
-
-        return 0;
+    public Integer getOrderNum(GetOrderNumDto dto) {
+        Long num = this.baseMapper.selectCount(new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getCityId, dto.getOpenCityId()).between(BaseModel::getCreateTime, dto.getTimeStr(), new Date()));
+        return num.intValue();
     }
 
 

--
Gitblit v1.7.1