From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 82598a0..aef4e71 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
@@ -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);
+ 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