From 4ac4b2a505c4384f7e9c21e43d0c112c8420c623 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 二月 2026 17:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 103 +++++++++++++++++++++++++++++----------------------
1 files changed, 58 insertions(+), 45 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 14e57ae..0b23609 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
@@ -108,6 +108,7 @@
private final XpPricingClient xpPricingClient;
private final XpSystemSettingClient xpSystemSettingClient;
+
@Override
public OrderStatisticsDTO getOrderStatistics(StatisticsQueryDTO query) {
OrderStatisticsDTO dto = new OrderStatisticsDTO();
@@ -769,6 +770,9 @@
evaluate.setAppUserId(Long.valueOf(uid));
evaluate.setOrderRating(dto.getOrderRating());
evaluate.setEvaluateTime(LocalDateTime.now());
+ evaluate.setFeedbackContent(dto.getFeedbackContent());
+ evaluate.setFeedbackPictures(dto.getFeedbackPictures());
+ evaluate.setFeedbackTypeId(dto.getFeedbackTypeId());
xpOrderEvaluateService.save(evaluate);
}
@@ -847,37 +851,38 @@
if (pricing == null) {
throw new ServiceException("当前城市未配置定价规则", I18nKeyConstant.ORDER_PRICING_NOT_EXISTS);
}
- Long id = pricing.getId();
- Integer pricingType = pricing.getPricingType();
- String basicPricingJson = pricing.getBasicPricingJson();
- String startingFareJson = pricing.getStartingFareJson();
- String dynamicPricingJson = pricing.getDynamicPricingJson();
- String priceRule = pricing.getPriceRule();
- // 根据计价规则计算费用
- BigDecimal startMoney = BigDecimal.ZERO;// 起步价
- BigDecimal mileageMoney = BigDecimal.ZERO;// 里程费
- BigDecimal durationMoney = BigDecimal.ZERO;// 时长费
- BigDecimal waitMoney = BigDecimal.ZERO;// 等待费
- BigDecimal longDistancemoney = BigDecimal.ZERO;// 远途费
- BigDecimal redPacketMoney = BigDecimal.ZERO;// 红包抵扣金额
- BigDecimal couponMoney = BigDecimal.ZERO;// 优惠券抵扣金额
- if (pricingType == 1) {
+// Long id = pricing.getId();
+// Integer pricingType = pricing.getPricingType();
+// String basicPricingJson = pricing.getBasicPricingJson();
+// String startingFareJson = pricing.getStartingFareJson();
+// String dynamicPricingJson = pricing.getDynamicPricingJson();
+// String priceRule = pricing.getPriceRule();
+// // 根据计价规则计算费用
+// BigDecimal startMoney = BigDecimal.ZERO;// 起步价
+// BigDecimal mileageMoney = BigDecimal.ZERO;// 里程费
+// BigDecimal durationMoney = BigDecimal.ZERO;// 时长费
+// BigDecimal waitMoney = BigDecimal.ZERO;// 等待费
+// BigDecimal longDistancemoney = BigDecimal.ZERO;// 远途费
+// BigDecimal redPacketMoney = BigDecimal.ZERO;// 红包抵扣金额
+// BigDecimal couponMoney = BigDecimal.ZERO;// 优惠券抵扣金额
+// if (pricingType == 1) {
+//
+// } else {
+//
+// }
+// if (org.springframework.util.StringUtils.hasLength(basicPricingJson)) {
+//
+// }
+// if (org.springframework.util.StringUtils.hasLength(startingFareJson)) {
+//
+// }
+// if (org.springframework.util.StringUtils.hasLength(dynamicPricingJson)) {
+//
+// }
+// if (org.springframework.util.StringUtils.hasLength(priceRule)) {
+//
+// }
- } else {
-
- }
- if (org.springframework.util.StringUtils.hasLength(basicPricingJson)) {
-
- }
- if (org.springframework.util.StringUtils.hasLength(startingFareJson)) {
-
- }
- if (org.springframework.util.StringUtils.hasLength(dynamicPricingJson)) {
-
- }
- if (org.springframework.util.StringUtils.hasLength(priceRule)) {
-
- }
// 计算完价格后 挑选优惠券
GetUserCouponDto getUserCouponDto = new GetUserCouponDto();
getUserCouponDto.setUserId(Long.valueOf(uid));
@@ -908,22 +913,30 @@
public R<FareBreakdownVo> fareBreakdown(Long orderId, String uid) {
XpOrder order = this.getById(orderId);
FareBreakdownVo fareBreakdownVo = new FareBreakdownVo();
- BeanUtils.copyProperties(order, fareBreakdownVo);
- fareBreakdownVo.setTotalKilometers(
- BigDecimal.valueOf(order.getStartMileage() + order.getMileageKilometers() + order.getLongDistance())
- );
- LocalDateTime createTime = order.getCreateTime();
- LocalDateTime tripEnd = order.getTripEnd();
- // 计算行程时间 单位分钟
+// fareBreakdownVo.setStart();
+// fareBreakdownVo.setMileage();
+// fareBreakdownVo.setDuration();
+// fareBreakdownVo.setLongDistance();
+// fareBreakdownVo.setRedPacketMoney();
+// fareBreakdownVo.setCouponMoney();
+// fareBreakdownVo.setOrderMoney();
- // 计算时间差
- Duration duration = Duration.between(createTime, tripEnd);
-
- // 转换为分钟并保留一位小数
- BigDecimal minutes = BigDecimal.valueOf(duration.getSeconds())
- .divide(BigDecimal.valueOf(60), 1, RoundingMode.HALF_UP);
-
- fareBreakdownVo.setTotalTime(minutes);
+// BeanUtils.copyProperties(order, fareBreakdownVo);
+// fareBreakdownVo.setTotalKilometers(
+// BigDecimal.valueOf(order.getStartMileage() + order.getMileageKilometers() + order.getLongDistance())
+// );
+// LocalDateTime createTime = order.getCreateTime();
+// LocalDateTime tripEnd = order.getTripEnd();
+// // 计算行程时间 单位分钟
+//
+// // 计算时间差
+// Duration duration = Duration.between(createTime, tripEnd);
+//
+// // 转换为分钟并保留一位小数
+// BigDecimal minutes = BigDecimal.valueOf(duration.getSeconds())
+// .divide(BigDecimal.valueOf(60), 1, RoundingMode.HALF_UP);
+//
+// fareBreakdownVo.setTotalTime(minutes);
return R.ok(fareBreakdownVo);
}
--
Gitblit v1.7.1