From 48effdca685a209c19dd2a0ccd456470a895784b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 十月 2024 18:01:18 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index f409dcd..1876252 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -47,7 +47,7 @@
*/
@ResponseBody
@PostMapping("/base/driver/queryIdleDriver")
- @ApiOperation(value = "获取5公里范围内空闲司机数量", tags = {"用户端-首页"}, notes = "")
+ @ApiOperation(value = "获取5公里范围内空闲司机数量【1.0】", tags = {"用户端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "乘客当前定位经度", name = "lon", required = true, dataType = "double"),
@@ -78,12 +78,12 @@
@ApiImplicitParam(value = "司机id", name = "id", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<DriverInfoWarpper> queryDriverInfo(Integer id){
+ public ResultUtil<DriverInfoWarpper> queryDriverInfo(Integer id, Integer language){
try {
Map<String, Object> map = driverService.queryDriverInfo(id);
- String name = String.valueOf(map.get("name"));
- map.put("name", name.substring(0, 1) + "师傅");
- List<BaseWarpper> list = driverService.queryBusiness(id);
+// String name = String.valueOf(map.get("name"));
+// map.put("name", name.substring(0, 1) + (language == 1 ? "师傅" : language == 2 ? "driver" : "Le conducteur"));
+ List<BaseWarpper> list = driverService.queryBusiness(id, language);
map.put("list", list);
return ResultUtil.success(DriverInfoWarpper.getDriverInfoWarpper(map));
}catch (Exception e){
@@ -108,9 +108,9 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<OrderEvaluateWarpper>> queryOrderEvaluate(Integer id, Integer pageNum, Integer size){
+ public ResultUtil<List<OrderEvaluateWarpper>> queryOrderEvaluate(Integer language, Integer id, Integer pageNum, Integer size){
try {
- List<Map<String, Object>> list = orderEvaluateService.queryOrderEvaluate(id, pageNum, size);
+ List<Map<String, Object>> list = orderEvaluateService.queryOrderEvaluate(language, id, pageNum, size);
return ResultUtil.success(OrderEvaluateWarpper.getOrderEvaluateWarpper(list));
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1