From 43d605c9eb708326cf229942bc0117cb8accd1c7 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期日, 12 四月 2026 16:19:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 8c08c37..42a4d30 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
@@ -1456,7 +1456,7 @@
// 获取点位信息
List<Long> startPointsIds = xpOrders.stream().map(XpOrder::getStartPointId).collect(Collectors.toList());
- R<List<XpHistoryStartPointsVo>> r = xpPointClient.getHistoryStartPoints(new HistoryStartPointsDto(startPointsIds, lon, lat));
+ R<List<XpHistoryStartPointsVo>> r = xpPointClient.getHistoryStartPoints(new HistoryStartPointsDto(startPointsIds, lon, lat,Long.valueOf(uid)));
List<XpHistoryStartPointsVo> data = r.getData();
@@ -1494,7 +1494,7 @@
// 获取点位信息
List<Long> endPointsIds = xpOrders.stream().map(XpOrder::getEndPointId).collect(Collectors.toList());
- R<List<XpHistoryEndPointsVo>> r = xpPointClient.getHistoryEndPoints(new HistoryEndPointsDto(endPointsIds, lon, lat));
+ R<List<XpHistoryEndPointsVo>> r = xpPointClient.getHistoryEndPoints(new HistoryEndPointsDto(endPointsIds, lon, lat,Long.valueOf(uid)));
List<XpHistoryEndPointsVo> data = r.getData();
@@ -3467,4 +3467,20 @@
}
log.info("订单修改价格推送消息完毕");
}
+
+
+ /**
+ * 获取待支付订单数量
+ * @param uid
+ * @return
+ */
+ @Override
+ public Integer getWaitPayOrderNum(String uid) {
+ Long num = this.baseMapper.selectCount(
+ new LambdaQueryWrapper<XpOrder>()
+ .eq(XpOrder::getAppUserId, uid)
+ .eq(XpOrder::getStatus, 8)
+ );
+ return num.intValue();
+ }
}
--
Gitblit v1.7.1