From e1b58eabfaeb88469ac14172607438a243dbc23c Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 11 六月 2026 09:24:50 +0800
Subject: [PATCH] 优化订单信息查询中的评分处理逻辑
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index eb44706..5009188 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1557,6 +1557,7 @@
@Override
public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
Map<String, Object> map = orderCrossCityMapper.queryOrderInfo(orderId);
+ fillDriverScoreForOrderScore(map);
if (null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2) {//如果订单有改派提醒，则查询后重置为未提醒
OrderCrossCity orderCrossCity = this.selectById(orderId);
orderCrossCity.setReassignNotice(0);
@@ -1585,6 +1586,16 @@
map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
map.put("orderType", 3);
return map;
+ }
+
+ private void fillDriverScoreForOrderScore(Map<String, Object> map) {
+ if (map == null || map.get("score") == null) {
+ return;
+ }
+ Object orderScore = map.get("orderScore");
+ if (orderScore == null || Double.valueOf(String.valueOf(orderScore)) == 0D) {
+ map.put("orderScore", map.get("score"));
+ }
}
/**
@@ -2791,9 +2802,7 @@
UnPayOrderVO unPayOrderVO = new UnPayOrderVO();
//添加司机信息
- DriverInfoWarpper driverInfoWarpper = new DriverInfoWarpper();
- Driver driver = driverService.selectById(orderCrossCity.getDriverId());
- BeanUtils.copyProperties(driver, driverInfoWarpper);
+ DriverInfoWarpper driverInfoWarpper = DriverInfoWarpper.getDriverInfoWarpper(driverService.queryDriverInfo(orderCrossCity.getDriverId()));
unPayOrderVO.setDriverInfoWarpper(driverInfoWarpper);
//其他信息
BeanUtils.copyProperties(orderCrossCity, unPayOrderVO);
--
Gitblit v1.7.1