From a4abb3c53f52f2c960cda9d8aa5b39f445bad957 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 20 五月 2026 18:55:37 +0800
Subject: [PATCH] update
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 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 0072100..8e2bed0 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
@@ -3523,26 +3523,26 @@
- // mvp版本不做支付 使用优惠券抵扣为0元订单处理 处理订单状态即可
- XpOrder order = this.getById(dto.getOrderId());
- order.setStatus(9);
- order.setAppUserId(null);
- if (order.getCouponId() != null) {
- UseUserCouponDto useUserCouponDto = new UseUserCouponDto();
- useUserCouponDto.setUserCouponId(order.getCouponId());
- R<BigDecimal> decimalR = xpAppUserCouponClient.useUserCoupon(useUserCouponDto);
- if (decimalR.getCode() == 200) {
- order.setCouponMoney(decimalR.getData());
- if (order.getCouponMoney().compareTo(order.getOrderMoney()) > 0) {
- order.setPayMoney(BigDecimal.ZERO);
- order.setCouponMoney(order.getOrderMoney());
- } else {
- order.setPayMoney(order.getOrderMoney().subtract(decimalR.getData()));
- }
- }
- }
- baseMapper.updateById(order);
- bootCommonService.setCache_orderStatus(order.getId(), order, null);
+// // mvp版本不做支付 使用优惠券抵扣为0元订单处理 处理订单状态即可
+// XpOrder order = this.getById(dto.getOrderId());
+// order.setStatus(9);
+// order.setAppUserId(null);
+// if (order.getCouponId() != null) {
+// UseUserCouponDto useUserCouponDto = new UseUserCouponDto();
+// useUserCouponDto.setUserCouponId(order.getCouponId());
+// R<BigDecimal> decimalR = xpAppUserCouponClient.useUserCoupon(useUserCouponDto);
+// if (decimalR.getCode() == 200) {
+// order.setCouponMoney(decimalR.getData());
+// if (order.getCouponMoney().compareTo(order.getOrderMoney()) > 0) {
+// order.setPayMoney(BigDecimal.ZERO);
+// order.setCouponMoney(order.getOrderMoney());
+// } else {
+// order.setPayMoney(order.getOrderMoney().subtract(decimalR.getData()));
+// }
+// }
+// }
+// baseMapper.updateById(order);
+// bootCommonService.setCache_orderStatus(order.getId(), order, null);
return R.fail();
}
@@ -5146,7 +5146,6 @@
itinerary.setStartPoint(xpOrder.getStartAddress());
itinerary.setEndPoint(xpOrder.getEndAddress());
itinerary.setMileage(xpOrder.getMileageKilometers()!=null ? xpOrder.getMileageKilometers().toString() :"0");
- itinerary.setAmount(xpOrder.getOrderMoney());
xpInvoiceVo.setItinerary(itinerary);
xpInvoiceVoList.add(xpInvoiceVo);
--
Gitblit v1.7.1