From 1910d031dbe03858a9b902e37c4e48c95e8b058b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 11 八月 2025 19:38:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
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/service/impl/OrderRideServiceImpl.java | 9 +++
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/IOrderRideService.java | 5 +
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/OrderRideMapper.java | 5 +
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml | 16 +++++
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 ++++++++++++++++++++++++
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 11 +++
8 files changed, 119 insertions(+), 6 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 542c62b..bf4209e 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -9,6 +9,8 @@
import com.stylefeng.guns.modular.call.server.IOrderCallService;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
+import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
+import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
@@ -163,7 +165,9 @@
@Autowired
private IServerCarModelService serverCarModelService;
-
+
+ @Autowired
+ private IOrderRideService orderRideService;
@@ -244,7 +248,7 @@
@PostMapping("/api/order/queryMyOrderList")
@ApiOperation(value = "获取个人中心订单列表", tags = {"用户端-个人中心"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城出行，4=同城小件物流， 5=跨城小件物流，6=包车，7=助老模式）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城出行，4=同城小件物流， 5=跨城小件物流，6=包车，7=助老模式，8顺风车）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "页码（首页1）", name = "pageNum", required = true, dataType = "int"),
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -278,6 +282,9 @@
case 7:
// list = orderCallService.queryMyOrderList(uid, pageNum, size);
break;
+ case 8:
+ list = orderRideService.queryMyOrderList(uid, pageNum, size);
+ break;
}
return ResultUtil.success(OrderWarpper.getOrderWarpper(list));
} catch (Exception e) {
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/OrderRideMapper.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/OrderRideMapper.java
index 821ce64..6e53c13 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/OrderRideMapper.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/OrderRideMapper.java
@@ -4,8 +4,10 @@
import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
import com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideInfoVo;
import com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideVo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -36,4 +38,7 @@
* @return
*/
OrderRideInfoVo getOrderInfo(OrderRideInfoVo orderRideInfoVo);
+
+ List<Map<String, Object>> queryMyOrderList(@Param("uid") Integer uid, @Param("pageNum") Integer pageNum, @Param("size") Integer size);
+
}
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 802bfb1..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,10 +81,24 @@
<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
left join t_user u on r.userId=u.id
</select>
+
+ <select id="queryMyOrderList" resultType="java.util.Map">
+ select
+ id as orderId,
+ DATE_FORMAT(addTime, '%Y-%m-%d %H:%i') as orderTime,
+ DATE_FORMAT(startTime, '%m月%d日 %H:%i') as time,
+ startName as startAddress,
+ endName as endAddress,
+ driverId as driverId,
+ (8) as orderType,
+ state as state
+ from app_order_ride where userId = #{uid} order by addTime desc limit #{pageNum}, #{size}
+ </select>
</mapper>
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/shunfeng/service/IOrderRideService.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/IOrderRideService.java
index 7377cd8..d051e69 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/IOrderRideService.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/IOrderRideService.java
@@ -6,6 +6,7 @@
import com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideVo;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -34,4 +35,8 @@
* @return
*/
OrderRideInfoVo getOrderInfo(OrderRideInfoVo orderRideInfoVo);
+
+ List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size);
+
+
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/impl/OrderRideServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/impl/OrderRideServiceImpl.java
index 3912c9d..ab4f226 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/impl/OrderRideServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/impl/OrderRideServiceImpl.java
@@ -8,7 +8,9 @@
import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -34,4 +36,11 @@
public OrderRideInfoVo getOrderInfo(OrderRideInfoVo orderRideInfoVo) {
return this.baseMapper.getOrderInfo(orderRideInfoVo);
}
+
+ @Override
+ public List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) {
+ pageNum = (pageNum - 1) * size;
+ List<Map<String, Object>> maps = this.baseMapper.queryMyOrderList(uid, pageNum, size);
+ return maps;
+ }
}
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