From 758e8551b0c6652fc11d727c94a0c85a17607c16 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 23 一月 2026 14:22:35 +0800
Subject: [PATCH] fix：城际专线扫码下单班次详情默认点区分起点终点
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/ScanOrderDetailWarpper.java | 28 ++++++++++++++++------------
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineShiftDriverMapper.xml | 14 ++++++++++----
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineShiftDriverServiceImpl.java | 16 +++++++++++-----
3 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineShiftDriverMapper.xml b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineShiftDriverMapper.xml
index 3eed80a..0d7d0ab 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineShiftDriverMapper.xml
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineShiftDriverMapper.xml
@@ -90,10 +90,16 @@
(SELECT s.lonLat FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 1 LIMIT 1) as startLonLat,
(SELECT s.lonLat FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 2 LIMIT 1) as endLonLat,
- -- 默认点信息（从起点站点获取）
- (SELECT s.defaultPointAddress FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 2 LIMIT 1) as defaultPointAddress,
- (SELECT s.defaultPointLon FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 2 LIMIT 1) as defaultPointLon,
- (SELECT s.defaultPointLat FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 2 LIMIT 1) as defaultPointLat,
+ -- 默认点信息
+ -- 起点默认点信息(type=1)
+ (SELECT s.defaultPointAddress FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 1 LIMIT 1) as startDefaultPointAddress,
+ (SELECT s.defaultPointLon FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 1 LIMIT 1) as startDefaultPointLon,
+ (SELECT s.defaultPointLat FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 1 LIMIT 1) as startDefaultPointLat,
+
+ -- 终点默认点信息(type=2)
+ (SELECT s.defaultPointAddress FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 2 LIMIT 1) as endDefaultPointAddress,
+ (SELECT s.defaultPointLon FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 2 LIMIT 1) as endDefaultPointLon,
+ (SELECT s.defaultPointLat FROM t_site s JOIN t_line_site tls ON s.id = tls.siteId WHERE tls.lineId = l.id AND tls.type = 2 LIMIT 1) as endDefaultPointLat,
-- 其他信息
cs.serverCarModelId as serverCarModelId,
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineShiftDriverServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineShiftDriverServiceImpl.java
index 00939a9..a7ee5ec 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineShiftDriverServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineShiftDriverServiceImpl.java
@@ -436,11 +436,17 @@
result.setEndCityName(data.get("endCityName") != null ? data.get("endCityName").toString() : null);
// 经纬度信息
result.setStartLonLat(data.get("startLonLat") != null ? data.get("startLonLat").toString() : null);
- result.setEndLonLat(data.get("endLonLat") != null ? data.get("endLonLat").toString() : null);
- // 默认点信息
- result.setDefaultPointAddress(data.get("defaultPointAddress") != null ? data.get("defaultPointAddress").toString() : null);
- result.setDefaultPointLon(data.get("defaultPointLon") != null ? Double.parseDouble(data.get("defaultPointLon").toString()) : null);
- result.setDefaultPointLat(data.get("defaultPointLat") != null ? Double.parseDouble(data.get("defaultPointLat").toString()) : null);
+ result.setEndLonLat(data.get("endLonLat") != null ? data.get("endLonLat").toString() : null); //
+ // 默认点信息(起点和终点)
+ // 起点默认点信息
+ result.setStartDefaultPointAddress(data.get("startDefaultPointAddress") != null ? data.get("startDefaultPointAddress").toString() : null);
+ result.setStartDefaultPointLon(data.get("startDefaultPointLon") != null ? Double.parseDouble(data.get("startDefaultPointLon").toString()) : null);
+ result.setStartDefaultPointLat(data.get("startDefaultPointLat") != null ? Double.parseDouble(data.get("startDefaultPointLat").toString()) : null);
+
+ // 终点默认点信息
+ result.setEndDefaultPointAddress(data.get("endDefaultPointAddress") != null ? data.get("endDefaultPointAddress").toString() : null);
+ result.setEndDefaultPointLon(data.get("endDefaultPointLon") != null ? Double.parseDouble(data.get("endDefaultPointLon").toString()) : null);
+ result.setEndDefaultPointLat(data.get("endDefaultPointLat") != null ? Double.parseDouble(data.get("endDefaultPointLat").toString()) : null);
// 其他信息
result.setServerCarModelId(data.get("serverCarModelId") != null ? Integer.parseInt(data.get("serverCarModelId").toString()) : null);
result.setDriverId(data.get("driverId") != null ? Integer.parseInt(data.get("driverId").toString()) : null);
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/ScanOrderDetailWarpper.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/ScanOrderDetailWarpper.java
index 063092a..6ca9ceb 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/ScanOrderDetailWarpper.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/ScanOrderDetailWarpper.java
@@ -77,14 +77,8 @@
@ApiModelProperty("线路起点站点城市名称")
private String startCityName;
- @ApiModelProperty("线路起点站点城市ID")
- private String startCityId;
-
@ApiModelProperty("线路结束站点城市名称")
private String endCityName;
-
- @ApiModelProperty("线路结束站点城市ID")
- private String endCityId;
@ApiModelProperty("起点站点经纬度")
private String startLonLat;
@@ -105,13 +99,23 @@
@ApiModelProperty("司机排班记录ID")
private Integer lineShiftDriverId;
- @ApiModelProperty("默认点位置")
- private String defaultPointAddress;
+ // ========== 起点默认点信息 ==========
+ @ApiModelProperty("起点默认点位置")
+ private String startDefaultPointAddress;
- @ApiModelProperty("默认点经度")
- private Double defaultPointLon;
+ @ApiModelProperty("起点默认点经度")
+ private Double startDefaultPointLon;
- @ApiModelProperty("默认点纬度")
- private Double defaultPointLat;
+ @ApiModelProperty("起点默认点纬度")
+ private Double startDefaultPointLat;
+ // ========== 终点默认点信息 ==========
+ @ApiModelProperty("终点默认点位置")
+ private String endDefaultPointAddress;
+
+ @ApiModelProperty("终点默认点经度")
+ private Double endDefaultPointLon;
+
+ @ApiModelProperty("终点默认点纬度")
+ private Double endDefaultPointLat;
}
--
Gitblit v1.7.1