From 6c16f85955aac8f964ccf444c450990d60ad9132 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 11 八月 2025 19:34:25 +0800
Subject: [PATCH] 我的订单顺风车
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java | 2
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml | 3 +
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderTravelMapper.xml | 5 +-
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/model/vo/OrderRideInfoVo.java | 72 ++++++++++++++++++++++++++++++++++++
4 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml
index 9348883..33c664f 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml
@@ -81,7 +81,8 @@
<select id="getOrderInfo" resultType="com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideInfoVo">
select r.addTime,r.startTime,r.endName,r.startName,r.money,r.id as userOrderId,r.state,t.id as driverOrderId,r.isEvaluate,t.isComplaint,
r.num,r.userId,r.driverId ,u.avatar as headImg,CASE when r.isDai=1 then r.lxPhone else u.phone end as phone,u.sex,u.nickName as name,u.totalOrders,
- calculate_distance(#{lat},#{lon},r.startLat, r.startLon) as distance,r.startLat as lat, r.startLon as lon
+ calculate_distance(#{lat},#{lon},r.startLat, r.startLon) as distance,r.startLat as lat, r.startLon as lon,r.endLon endLon,r.endLat endLat,
+ t.startLat as latDriver, t.startLon as lonDriver,t.endLon endLonDriver,t.endLat endLatDriver
from (select * from app_order_ride where id=#{userOrderId}) r
left join app_order_travel t on r.travelId=t.id
left join app_driver_ride d on d.id=r.driverId
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderTravelMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderTravelMapper.xml
index 324ebb8..f839abe 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderTravelMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderTravelMapper.xml
@@ -59,8 +59,9 @@
<!--根据订单id获取订单详情-->
<select id="getOrderInfo" resultType="com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideInfoVo">
select t.addTime,r.startTime,r.endName,r.startName,r.money,r.id as userOrderId,r.state,t.id as driverOrderId,r.isComplaint,r.num,
- r.userId,r.driverId,u.avatar as headImg,u.phone,u.sex,u.nickName as realName as name,d.carNum,d.carType,d.totalOrders,IFNULL(format(d.evaluateScore/d.evaluateNum,2),0)as evaluateScore,r.evaluateScoreUser,r.isEvaluate
- ,r.content,t.startLat as lat, t.startLon as lon
+ r.userId,r.driverId,u.avatar as headImg,u.phone,u.sex,u.nickName as name,d.carNum,d.carType,d.totalOrders,IFNULL(format(d.evaluateScore/d.evaluateNum,2),0)as evaluateScore,r.evaluateScoreUser,r.isEvaluate
+ ,r.content,r.startLat as lat, r.startLon as lon,r.endLon endLon,r.endLat endLat,
+ t.startLat as latDriver, t.startLon as lonDriver,t.endLon endLonDriver,t.endLat endLatDriver
from (select * from app_order_travel where id= #{driverOrderId}) t
left join app_order_ride r on t.id=r.travelId
left join app_driver_ride d on d.id=t.driverId
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/model/vo/OrderRideInfoVo.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/model/vo/OrderRideInfoVo.java
index d268243..ae62814 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/model/vo/OrderRideInfoVo.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/model/vo/OrderRideInfoVo.java
@@ -48,6 +48,20 @@
/*位置 纬度*/
private Double lat=0d;
+ /*位置经度*/
+ private Double endLon=0d;
+ /*位置 纬度*/
+ private Double endLat=0d;
+ /*位置经度*/
+ private Double lonDriver=0d;
+ /*位置 纬度*/
+ private Double latDriver=0d;
+
+ /*位置经度*/
+ private Double endLonDriver=0d;
+ /*位置 纬度*/
+ private Double endLatDriver=0d;
+
/*状态（1未支付，2已支付，3待出行，4出行中，5完成，6取消）*/
private Integer state;
@@ -65,6 +79,64 @@
*/
private String content;
+ private String driverPhone;
+
+ public String getDriverPhone() {
+ return driverPhone;
+ }
+
+ public void setDriverPhone(String driverPhone) {
+ this.driverPhone = driverPhone;
+ }
+
+ public Double getLonDriver() {
+ return lonDriver;
+ }
+
+ public void setLonDriver(Double lonDriver) {
+ this.lonDriver = lonDriver;
+ }
+
+ public Double getLatDriver() {
+ return latDriver;
+ }
+
+ public void setLatDriver(Double latDriver) {
+ this.latDriver = latDriver;
+ }
+
+ public Double getEndLonDriver() {
+ return endLonDriver;
+ }
+
+ public void setEndLonDriver(Double endLonDriver) {
+ this.endLonDriver = endLonDriver;
+ }
+
+ public Double getEndLatDriver() {
+ return endLatDriver;
+ }
+
+ public void setEndLatDriver(Double endLatDriver) {
+ this.endLatDriver = endLatDriver;
+ }
+
+ public Double getEndLat() {
+ return endLat;
+ }
+
+ public void setEndLat(Double endLat) {
+ this.endLat = endLat;
+ }
+
+ public Double getEndLon() {
+ return endLon;
+ }
+
+ public void setEndLon(Double endLon) {
+ this.endLon = endLon;
+ }
+
public Integer getUserId() {
return userId;
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
index 8c44e45..9e33b27 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -160,7 +160,7 @@
public QianYunTongConfig getQianYunTongConfig() {
if("dev".equals(activeProfile)){
this.appkey = "10001104";
- this.privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
+ this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem";
this.userName = "xiaofei";
this.status = "1";
this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
--
Gitblit v1.7.1