From b50c961c49851d140d77d549db34a9f6400dadd4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 19:03:10 +0800
Subject: [PATCH] 跨城推广
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java | 32 ++++++++------------------------
1 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
index 03cba5a..5aa9a5d 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
@@ -1290,23 +1290,15 @@
@ApiOperation(value = "用户订单匹配列表页面，用户订单去匹配司机的行程", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "orderId", value = "订单id", dataType = "int"),
- @ApiImplicitParam(name = "type", value = "1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近", dataType = "int"),
- @ApiImplicitParam(name = "lon", value = "经度", dataType = "double"),
- @ApiImplicitParam(name = "lat", value = "纬度", dataType = "double"),
+ @ApiImplicitParam(name = "type", value = "1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近", dataType = "int")
})
- public Object userMatchingOrderList(Integer orderId,Integer current,Integer size,Integer type,Double lon,Double lat){
+ public Object userMatchingOrderList(Integer orderId,Integer current,Integer size,Integer type){
try {
if(ToolUtil.isEmpty(orderId)){
return ResultUtil.paranErr("orderId不能为空");
}
if(ToolUtil.isEmpty(type)){
return ResultUtil.paranErr("type不能为空");
- }
- if(ToolUtil.isEmpty(lon)){
- return ResultUtil.paranErr("lon不能为空");
- }
- if(ToolUtil.isEmpty(lat)){
- return ResultUtil.paranErr("lat不能为空");
}
OrderRide orderRide=orderRideService.selectById(orderId);
current=current==null?1:current;
@@ -1316,8 +1308,8 @@
OrderRideVo orderRideVo=new OrderRideVo();
orderRideVo.setCurrent(current);
orderRideVo.setSize(size);
- orderRideVo.setLon(lon);
- orderRideVo.setLat(lat);
+ orderRideVo.setLon(orderRide.getStartLon());
+ orderRideVo.setLat(orderRide.getStartLat());
orderRideVo.setNum(orderRide.getNum());
orderRideVo.setType(type+1);//搜索条件：1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近
List<OrderRideVo> orderRides=orderTravelService.getOrderTravel(orderRideVo);
@@ -1343,11 +1335,9 @@
@ApiOperation(value = "司机订单匹配列表页面(司机的订单去匹配乘客订单)", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "orderId", value = "订单id", dataType = "int"),
- @ApiImplicitParam(name = "type", value = "1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近，4价格最低", dataType = "int"),
- @ApiImplicitParam(name = "lon", value = "经度", dataType = "double"),
- @ApiImplicitParam(name = "lat", value = "纬度", dataType = "double"),
+ @ApiImplicitParam(name = "type", value = "1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近，4价格最低", dataType = "int")
})
- public Object driverMatchingOrderList(Integer orderId,Integer current,Integer size,Integer type,Double lon,Double lat){
+ public Object driverMatchingOrderList(Integer orderId,Integer current,Integer size,Integer type){
try {
try {
if(ToolUtil.isEmpty(orderId)){
@@ -1355,12 +1345,6 @@
}
if(ToolUtil.isEmpty(type)){
return ResultUtil.paranErr("type不能为空");
- }
- if(ToolUtil.isEmpty(lon)){
- return ResultUtil.paranErr("lon不能为空");
- }
- if(ToolUtil.isEmpty(lat)){
- return ResultUtil.paranErr("lat不能为空");
}
OrderTravel orderTravel=orderTravelService.selectById(orderId);
current=current==null?1:current;
@@ -1371,8 +1355,8 @@
orderRideVo.setCurrent(current);
orderRideVo.setSize(size);
orderRideVo.setNum(orderTravel.getNum());
- orderRideVo.setLon(lon);
- orderRideVo.setLat(lat);
+ orderRideVo.setLon(orderTravel.getStartLon());
+ orderRideVo.setLat(orderTravel.getStartLat());
orderRideVo.setType(type+1);//搜索条件：1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近，4价格最低
List<OrderRideVo> orderRides=orderRideService.getOrderRide(orderRideVo);
return ResultUtil.success(orderRides);
--
Gitblit v1.7.1