From 0023826c6e63c828a4df56e1332bf311e6256042 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 27 二月 2026 17:26:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 f058762..9dcd7f9 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
@@ -950,16 +950,7 @@
throw new RuntimeException("订单状态错误");
}
order.setStatus(8);
- // 计算完价格后 挑选优惠券
- GetUserCouponDto getUserCouponDto = new GetUserCouponDto();
- getUserCouponDto.setUserId(Long.valueOf(uid));
- getUserCouponDto.setTotalAmount(order.getOrderMoney().doubleValue());
- R<UserCouponVo> userCouponVoR = xpAppUserCouponClient.getUserCoupon(getUserCouponDto);
- UserCouponVo userCouponVo = userCouponVoR.getData();
- if (userCouponVo != null) {
- order.setCouponId(userCouponVo.getId());
- order.setCouponMoney(BigDecimal.valueOf(userCouponVo.getMoney()));
- }
+ order.setAppUserId(null);
order.setTripEnd(LocalDateTime.now());
baseMapper.updateById(order);
// 解绑用户与车辆关系
@@ -1201,6 +1192,7 @@
.add(order.getLongDistancemoney() != null ? order.getLongDistancemoney() : BigDecimal.ZERO)
.add(order.getWaitMoney()!=null?order.getWaitMoney():BigDecimal.ZERO);
order.setOrderMoney(orderMoney);
+ order.setAppUserId(null);
baseMapper.updateById(order);
if (order.getCouponId() != null) {
UseUserCouponDto useUserCouponDto = new UseUserCouponDto();
@@ -1211,10 +1203,18 @@
useUserCouponDto.setUserCouponId(order.getCouponId());
xpAppUserCouponClient.useUserCoupon(useUserCouponDto);
}
-
-
-
-
+// 计算完价格后 挑选优惠券
+ GetUserCouponDto getUserCouponDto = new GetUserCouponDto();
+ getUserCouponDto.setUserId(Long.valueOf(uid));
+ getUserCouponDto.setTotalAmount(order.getOrderMoney().doubleValue());
+ R<UserCouponVo> userCouponVoR = xpAppUserCouponClient.getUserCoupon(getUserCouponDto);
+ UserCouponVo userCouponVo = userCouponVoR.getData();
+ if (userCouponVo != null) {
+ order.setCouponId(userCouponVo.getId());
+ order.setCouponMoney(BigDecimal.valueOf(userCouponVo.getMoney()));
+ }
+ order.setAppUserId(null);
+ baseMapper.updateById(order);
// 结束后的车辆操作
if(vehicle!=null){
// 生成新的巡游单子 回到最新巡游的初始起点位置
--
Gitblit v1.7.1