From ddcef762ff4a159e132c68dfec512c60a68a53e6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 十二月 2023 18:21:24 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index a989545..2a6fe57 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -200,7 +200,7 @@
}
}
boolean b = driverService.checkCaptcha(email, phone, code);
- return b ? ResultUtil.success() : ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return b ? ResultUtil.success() : ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -750,9 +750,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "司机id", name = "uid", required = true, dataType = "int"),
})
- public ResultUtil<DriverInfoWarpper> queryInfo_(Integer uid){
+ public ResultUtil<DriverInfoWarpper> queryInfo_(Integer language, Integer uid){
try {
- Map<String, Object> map = driverService.queryInfo(uid);
+ Map<String, Object> map = driverService.queryInfo(language, uid);
return ResultUtil.success(DriverInfoWarpper.getDriverInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
@@ -771,13 +771,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<DriverInfoWarpper> queryInfo(HttpServletRequest request){
+ public ResultUtil<DriverInfoWarpper> queryInfo(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- Map<String, Object> map = driverService.queryInfo(uid);
+ Map<String, Object> map = driverService.queryInfo(language, uid);
map.put("qrCodeIsOpen",driverService.getAppOpenInfo(1)==1);
DriverInfoWarpper driverInfoWarpper = DriverInfoWarpper.getDriverInfoWarpper(map);
// Double money = driverService.getThisWeekMoney(uid);
@@ -1040,13 +1040,13 @@
@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<BaseWarpper>> queryPenalties(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<BaseWarpper>> queryPenalties(Integer language, Integer pageNum, Integer size, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = driverService.queryPenalties(pageNum, size, uid);
+ List<Map<String, Object>> list = driverService.queryPenalties(language, pageNum, size, uid);
List<BaseWarpper> data = new ArrayList<>();
for(Map<String, Object> map : list){
BaseWarpper baseWarpper = new BaseWarpper();
@@ -1084,7 +1084,7 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = driverService.queryActivityIncome(uid, pageNum, size);
+ List<Map<String, Object>> list = driverService.queryActivityIncome(language, uid, pageNum, size);
List<BaseWarpper> data = new ArrayList<>();
for(Map<String, Object> map : list){
BaseWarpper baseWarpper = new BaseWarpper();
@@ -1122,7 +1122,7 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = driverService.queryTotalRevenue(uid, pageNum, size);
+ List<Map<String, Object>> list = driverService.queryTotalRevenue(language, uid, pageNum, size);
List<BaseWarpper> data = new ArrayList<>();
for(Map<String, Object> map : list){
BaseWarpper baseWarpper = new BaseWarpper();
@@ -1467,13 +1467,13 @@
@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 getInviteList(Integer type,Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil getInviteList(Integer language, Integer type,Integer pageNum, Integer size, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String,Object>> list = driverService.queryMyInviteList(type,uid, pageNum, size);
+ List<Map<String,Object>> list = driverService.queryMyInviteList(language, type,uid, pageNum, size);
return ResultUtil.success(DriverInviteInfoWarpper.getDriverInviteInfoWarpper(list));
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1