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
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 325 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 230 insertions(+), 95 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 c7b79df..febd52d 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
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.api;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
@@ -8,12 +9,11 @@
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
-import com.stylefeng.guns.modular.system.model.City;
-import com.stylefeng.guns.modular.system.model.Driver;
-import com.stylefeng.guns.modular.system.model.Income;
-import com.stylefeng.guns.modular.system.model.OrderPosition;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ALiSendSms;
+import com.stylefeng.guns.modular.system.util.DateUtil;
+import com.stylefeng.guns.modular.system.util.EmailUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -22,6 +22,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -81,6 +82,9 @@
@Value("${share.url}")
private String shareUrl;
+ @Autowired
+ private TEmailService emailService;
+
/**
@@ -134,6 +138,13 @@
})
public ResultUtil queryCaptcha(String phone, Integer type, Integer language){
if(ToolUtil.isNotEmpty(phone)){
+ String substring = phone.substring(0, 1);
+ if("0".equals(substring)){
+ phone = "233" + phone.substring(1);
+ }
+ if(phone.indexOf("233") < 0){
+ phone = "233" + phone;
+ }
try {
return driverService.queryCaptcha(phone, type, language);
}catch (Exception e){
@@ -177,12 +188,22 @@
@ApiOperation(value = "验证验证码", tags = {"司机端-注册"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "邮箱", name = "email", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "手机号码", name = "phone", required = true, dataType = "String"),
@ApiImplicitParam(value = "验证码", name = "code", required = true, dataType = "String")
})
- public ResultUtil checkCaptcha(String email, String code){
+ public ResultUtil checkCaptcha(String email, String phone, String code, Integer language){
try {
- boolean b = driverService.checkCaptcha(email, code);
- return b ? ResultUtil.success() : ResultUtil.error("验证码无效");
+ if(ToolUtil.isNotEmpty(phone)){
+ String substring = phone.substring(0, 1);
+ if("0".equals(substring)){
+ phone = "233" + phone.substring(1);
+ }
+ if(phone.indexOf("233") < 0){
+ phone = "233" + phone;
+ }
+ }
+ boolean b = driverService.checkCaptcha(email, phone, code);
+ return b ? ResultUtil.success() : ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -195,8 +216,9 @@
*/
@ResponseBody
@PostMapping("/base/driver/registeredDriver")
- @ApiOperation(value = "司机提交注册申请", tags = {"分享专用"}, notes = "")
+ @ApiOperation(value = "司机提交注册申请【1.1】", tags = {"分享专用"}, notes = "")
@ApiImplicitParams({
+ @ApiImplicitParam(value = "手机号码运营商", name = "phoneOperator", required = true, dataType = "String"),
@ApiImplicitParam(value = "手机号码", name = "phone", required = true, dataType = "String"),
@ApiImplicitParam(value = "短信验证码", name = "code", required = true, dataType = "String"),
@ApiImplicitParam(value = "密码", name = "password", required = true, dataType = "String"),
@@ -204,9 +226,30 @@
@ApiImplicitParam(value = "用户类型（1=用户，2=司机）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "注册类型（1=司机注册，2=用户注册）", name = "userType", required = true, dataType = "int")
})
- public ResultUtil registeredDriver(String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language){
+ public ResultUtil registeredDriver(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language){
try {
- return driverService.registeredDriver(phone, code, password, uid, type, userType, language);
+ String substring = phone.substring(0, 1);
+ if("0".equals(substring)){
+ phone = "233" + phone.substring(1);
+ }
+ if(phone.indexOf("233") < 0){
+ phone = "233" + phone;
+ }
+ switch (phoneOperator){
+ case "MTN":
+ phoneOperator = "GH-MTN-B2C";
+ break;
+ case "TIGO":
+ phoneOperator = "GH-TIGO-B2C";
+ break;
+ case "VODAFONE":
+ phoneOperator = "GH-VODAFONE-B2C";
+ break;
+ case "AIRTEL":
+ phoneOperator = "GH-AIRTEL-B2C";
+ break;
+ }
+ return driverService.registeredDriver1(phoneOperator, phone, code, password, uid, type, userType, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -223,8 +266,9 @@
*/
@ResponseBody
@PostMapping("/base/driver/registeredDriver_")
- @ApiOperation(value = "司机提交注册申请", tags = {"司机端-注册"}, notes = "")
+ @ApiOperation(value = "司机提交注册申请【1.1】", tags = {"司机端-注册"}, notes = "")
@ApiImplicitParams({
+ @ApiImplicitParam(value = "手机号码运营商", name = "phoneOperator", required = true, dataType = "String"),
@ApiImplicitParam(value = "手机号码", name = "phone", required = true, dataType = "String"),
@ApiImplicitParam(value = "短信验证码", name = "code", required = true, dataType = "String"),
@ApiImplicitParam(value = "密码", name = "password", required = true, dataType = "String"),
@@ -232,9 +276,30 @@
@ApiImplicitParam(value = "用户类型（1=用户，2=司机）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "注册类型（1=司机注册，2=用户注册）", name = "userType", required = true, dataType = "int")
})
- public ResultUtil<LoginWarpper> registeredDriver_(String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language){
+ public ResultUtil<LoginWarpper> registeredDriver_(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language){
try {
- return driverService.registeredDriver(phone, code, password, uid, type, userType, language);
+ String substring = phone.substring(0, 1);
+ if("0".equals(substring)){
+ phone = "233" + phone.substring(1);
+ }
+ if(phone.indexOf("233") < 0){
+ phone = "233" + phone;
+ }
+ switch (phoneOperator){
+ case "MTN":
+ phoneOperator = "GH-MTN-B2C";
+ break;
+ case "TIGO":
+ phoneOperator = "GH-TIGO-B2C";
+ break;
+ case "VODAFONE":
+ phoneOperator = "GH-VODAFONE-B2C";
+ break;
+ case "AIRTEL":
+ phoneOperator = "GH-AIRTEL-B2C";
+ break;
+ }
+ return driverService.registeredDriver(phoneOperator, phone, code, password, uid, type, userType, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -269,7 +334,7 @@
*/
@ResponseBody
@PostMapping("/base/driver/updateDriver")
- @ApiOperation(value = "司机注册后完善个人信息【1.0】", tags = {"司机端-注册"}, notes = "")
+ @ApiOperation(value = "司机注册后完善个人信息【1.1】", tags = {"司机端-注册"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "司机id", name = "uid", required = true, dataType = "int")
})
@@ -306,6 +371,36 @@
}
+ @ResponseBody
+ @PostMapping("/api/driver/getEmailList")
+ @ApiOperation(value = "获取邮箱信息", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<EmailWarpper>> getEmailList(Integer language, HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ List<TEmail> tEmails = emailService.selectList(new EntityWrapper<TEmail>().eq("userId", uid).eq("type", 2).orderBy("createTime", false));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<EmailWarpper> list = new ArrayList<>();
+ for (TEmail tEmail : tEmails) {
+ EmailWarpper warpper = new EmailWarpper();
+ BeanUtils.copyProperties(tEmail, warpper);
+ warpper.setCreateTime(DateUtil.conversionFormat(language, sdf.format(tEmail.getCreateTime())));
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(tEmail.getCreateTime())-1;
+ warpper.setWeek(EmailUtil.getWeek(language,i));
+ list.add(warpper);
+ }
+ return ResultUtil.success(list);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
/**
* 司机注册后完善车辆信息
@@ -331,9 +426,9 @@
@ApiImplicitParam(value = "车辆id", name = "carId", required = false, dataType = "int")
})
public ResultUtil addDriverCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicenseNumber, String drivingLicensePhoto, String drivingLicenseEndTime,
- String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid, Integer carId, String peopleAndCarsPhone){
+ String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid, Integer carId, String peopleAndCarsPhone, Integer language){
try {
- return carService.addCar(modelId, color, licensePlate, time, drivingLicenseNumber, drivingLicensePhoto, drivingLicenseEndTime, carPhoto, insurancePhoto, commercialInsuranceTime, uid,carId, peopleAndCarsPhone);
+ return carService.addCar(modelId, color, licensePlate, time, drivingLicenseNumber, drivingLicensePhoto, drivingLicenseEndTime, carPhoto, insurancePhoto, commercialInsuranceTime, uid,carId, peopleAndCarsPhone, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -401,13 +496,19 @@
})
public ResultUtil resetPassword(String phone, String code, String password, Integer language){
try {
+ String substring = phone.substring(0, 1);
+ if("0".equals(substring)){
+ phone = "233" + phone.substring(1);
+ }
+ if(phone.indexOf("233") < 0){
+ phone = "233" + phone;
+ }
return driverService.resetPassword(phone, code, password, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
/**
* 获取忘记密码页面的电话
@@ -444,9 +545,16 @@
@ApiImplicitParam(value = "手机号码", name = "phone", required = true, dataType = "String"),
@ApiImplicitParam(value = "密码", name = "password", required = true, dataType = "String")
})
- public ResultUtil<LoginWarpper> driverLogin(String phone, String password){
+ public ResultUtil<LoginWarpper> driverLogin(String phone, String password, Integer language){
try {
- return driverService.driverLogin(phone, password);
+ String substring = phone.substring(0, 1);
+ if("0".equals(substring)){
+ phone = "233" + phone.substring(1);
+ }
+ if(phone.indexOf("233") < 0){
+ phone = "233" + phone;
+ }
+ return driverService.driverLogin(phone, password, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -465,20 +573,19 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<HomeWarpper> queryHomeData(HttpServletRequest request){
+ public ResultUtil<HomeWarpper> queryHomeData(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- Map<String, Object> map = driverService.queryHomeData(uid);
+ Map<String, Object> map = driverService.queryHomeData(uid, language);
return ResultUtil.success(HomeWarpper.getHomeWarpper(map));
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
/**
* 司机上下班操作
@@ -493,13 +600,13 @@
@ApiImplicitParam(value = "上班的业务类型（1=专车，4=小件物流-同城）多个已逗号分隔", name = "type", required = false, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil work(String type, HttpServletRequest request){
+ public ResultUtil work(String type, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return driverService.work(uid, type);
+ return driverService.work(uid, type, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -560,7 +667,6 @@
}
}
-
@ResponseBody
@PostMapping("/api/driver/work2")
@ApiOperation(value = "司机上下班操作,同时设置接单类型【1.0】", tags = {"司机端-车载端"}, notes = "")
@@ -568,19 +674,18 @@
@ApiImplicitParam(value = "上班的业务类型（1=专车，4=小件物流-同城）多个已逗号分隔", name = "type", required = false, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil work2(String type, HttpServletRequest request){
+ public ResultUtil work2(String type, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return driverService.work2(uid, type);
+ return driverService.work2(uid, type, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
@ResponseBody
@PostMapping("/api/driver/queryHomeNum")
@@ -588,21 +693,19 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil queryHomeNum(HttpServletRequest request){
+ public ResultUtil queryHomeNum(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- Map<String, Object> map = driverService.queryHomeNum(uid);
+ Map<String, Object> map = driverService.queryHomeNum(uid, language);
return ResultUtil.success(map);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
/**
* 上班时选择的业务类型
@@ -615,14 +718,14 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<BaseWarpper>> queryMyBusiness(HttpServletRequest request){
+ public ResultUtil<List<BaseWarpper>> queryMyBusiness(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
// TODO: 2020/7/21 修改为个人中心中设置的接单业务类型。
- List<BaseWarpper> list = driverService.queryMyBusiness(uid);
+ List<BaseWarpper> list = driverService.queryMyBusiness(uid, language);
List<Integer> integers = driverOrdersService.queryOrders(uid);
List<BaseWarpper> data = new ArrayList<>();
@@ -637,7 +740,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 存储订单服务中的司机位置
@@ -656,26 +758,21 @@
}
}
-
-
@ResponseBody
@PostMapping("/base/driver/queryInfo_")
@ApiOperation(value = "根据用户id获取数据", tags = {"司机端-注册"}, notes = "")
@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();
return ResultUtil.runErr();
}
}
-
-
-
/**
* 获取个人中心详情
@@ -688,13 +785,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);
@@ -707,7 +804,6 @@
}
}
-
/**
* 修改手机号码
* @param phone
@@ -717,19 +813,41 @@
*/
@ResponseBody
@PostMapping("/api/driver/updatePhone")
- @ApiOperation(value = "修改手机号码", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "修改手机号码【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
+ @ApiImplicitParam(value = "手机号码运营商", name = "phoneOperator", required = true, dataType = "String"),
@ApiImplicitParam(value = "新电话号码", name = "phone", required = true, dataType = "String"),
@ApiImplicitParam(value = "短信验证码", name = "code", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil updatePhone(String phone, String code, HttpServletRequest request){
+ public ResultUtil updatePhone(String phoneOperator, String phone, String code, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return driverService.updatePhone(phone, code, uid);
+ String substring = phone.substring(0, 1);
+ if("0".equals(substring)){
+ phone = "233" + phone.substring(1);
+ }
+ if(phone.indexOf("233") < 0){
+ phone = "233" + phone;
+ }
+ switch (phoneOperator){
+ case "MTN":
+ phoneOperator = "GH-MTN-B2C";
+ break;
+ case "TIGO":
+ phoneOperator = "GH-TIGO-B2C";
+ break;
+ case "VODAFONE":
+ phoneOperator = "GH-VODAFONE-B2C";
+ break;
+ case "AIRTEL":
+ phoneOperator = "GH-AIRTEL-B2C";
+ break;
+ }
+ return driverService.updatePhone(phoneOperator, phone, code, uid, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -756,8 +874,6 @@
return ResultUtil.runErr();
}
}
-
-
/**
* 修改密码
@@ -786,7 +902,6 @@
}
}
-
/**
* 获取设置接单的业务类型列表
* @param request
@@ -798,13 +913,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<OrdersWarpper>> querySetOrders(HttpServletRequest request){
+ public ResultUtil<List<OrdersWarpper>> querySetOrders(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<BaseWarpper> list = driverService.queryMyBusiness(uid);
+ List<BaseWarpper> list = driverService.queryMyBusiness(uid, language);
List<Integer> integers = driverOrdersService.queryOrders(uid);
List<OrdersWarpper> data = new ArrayList<>();
for(BaseWarpper b : list){
@@ -821,10 +936,6 @@
}
}
-
-
-
-
/**
* 设置接单规则
* @param type
@@ -838,19 +949,18 @@
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil updateOrders(Integer type, HttpServletRequest request){
+ public ResultUtil updateOrders(Integer type, Integer language, HttpServletRequest request){
try{
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return driverOrdersService.updateOrders(uid, type);
+ return driverOrdersService.updateOrders(uid, type, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
/**
* 获取当前车辆及空闲车辆
@@ -877,7 +987,6 @@
}
}
-
/**
* 更换车辆
* @param carId
@@ -891,13 +1000,13 @@
@ApiImplicitParam(value = "车辆id", name = "carId", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil replaceCar(Integer carId, HttpServletRequest request){
+ public ResultUtil replaceCar(Integer carId, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return driverService.replaceCar(carId, uid);
+ return driverService.replaceCar(carId, uid, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -945,13 +1054,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();
@@ -983,19 +1092,19 @@
@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>> queryActivityIncome(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<BaseWarpper>> queryActivityIncome(Integer pageNum, Integer size, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
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();
baseWarpper.setDay(String.valueOf(null != map.get("time") ? map.get("time") : ""));
baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
- baseWarpper.setName("活动奖励");
+ baseWarpper.setName(language == 1 ? "活动奖励" : language == 2 ? "Activity reward" : "Récompenses pour événements");
data.add(baseWarpper);
}
return ResultUtil.success(data);
@@ -1021,13 +1130,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>> queryTotalRevenue(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<BaseWarpper>> queryTotalRevenue(Integer pageNum, Integer size, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
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();
@@ -1035,19 +1144,19 @@
baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
switch (Integer.valueOf(String.valueOf(null != map.get("orderType") ? map.get("orderType") : 0))){
case 1:
- baseWarpper.setName("专车");
+ baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
break;
case 2:
- baseWarpper.setName("出租车");
+ baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
break;
case 3:
- baseWarpper.setName("城际出行");
+ baseWarpper.setName(language == 1 ? "城际出行" : language == 2 ? "Intercity travel" : "Mobilité entre villes");
break;
case 4:
- baseWarpper.setName("市内小件物流");
+ baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
break;
case 5:
- baseWarpper.setName("跨城小件物流");
+ baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
break;
}
Map<String, Object> map1 = new HashMap<>();
@@ -1121,13 +1230,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<ActivityWarpper>> queryMyActivity(HttpServletRequest request){
+ public ResultUtil<List<ActivityWarpper>> queryMyActivity(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(driverService.queryMyActivity(uid, new Date()));
+ return ResultUtil.success(driverService.queryMyActivity(uid, new Date(), language));
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -1150,13 +1259,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 queryHistoryActivity(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil queryHistoryActivity(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.queryHistory(uid, pageNum, size);
+ List<Map<String, Object>> list = driverService.queryHistory(language, uid, pageNum, size);
return ResultUtil.success(list);
}catch (Exception e){
e.printStackTrace();
@@ -1178,14 +1287,14 @@
@ApiImplicitParam(value = "查询的给定日期", name = "time", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil queryHistoryActivityInfo(String time, HttpServletRequest request){
+ public ResultUtil queryHistoryActivityInfo(String time, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
- List<ActivityWarpper> activityWarppers = driverService.queryMyActivity(uid, sdf.parse(time));
+ List<ActivityWarpper> activityWarppers = driverService.queryMyActivity(uid, sdf.parse(time), language);
return ResultUtil.success(activityWarppers);
}catch (Exception e){
e.printStackTrace();
@@ -1205,9 +1314,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "工号", name = "jobNum", required = true, dataType = "String"),
})
- public ResultUtil loginByJobNumber(String jobNum){
+ public ResultUtil loginByJobNumber(String jobNum, Integer language){
try {
- return driverService.loginByJobNumber(jobNum);
+ return driverService.loginByJobNumber(jobNum, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -1226,9 +1335,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "身份证号码", name = "identification", required = true, dataType = "String"),
})
- public ResultUtil loginByIdentification(String identification){
+ public ResultUtil loginByIdentification(String identification, Integer language){
try {
- return driverService.loginByIdentification(identification);
+ return driverService.loginByIdentification(identification, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -1248,9 +1357,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "出租车资格证号", name = "taxiAptitudeCard", required = true, dataType = "String"),
})
- public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard){
+ public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard, Integer language){
try {
- return driverService.loginByTaxiAptitudeCard(taxiAptitudeCard);
+ return driverService.loginByTaxiAptitudeCard(taxiAptitudeCard, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -1270,13 +1379,13 @@
@ApiImplicitParam(value = "登录密码", name = "password", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil verificationPassword(String password, HttpServletRequest request){
+ public ResultUtil verificationPassword(String password, Integer language, HttpServletRequest request){
try {
Integer driverId = driverService.getUserIdFormRedis(request);
if(null == driverId){
return ResultUtil.tokenErr();
}
- return driverService.verificationPassword(password, driverId);
+ return driverService.verificationPassword(password, driverId, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -1297,13 +1406,13 @@
@ApiImplicitParam(value = "提现密码", name = "withdrawPassword", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil setWithdrawPassword(String withdrawPassword, HttpServletRequest request){
+ public ResultUtil setWithdrawPassword(String withdrawPassword, Integer language, HttpServletRequest request){
try {
Integer driverId = driverService.getUserIdFormRedis(request);
if(null == driverId){
return ResultUtil.tokenErr();
}
- return driverService.setWithdrawPassword(withdrawPassword, driverId);
+ return driverService.setWithdrawPassword(withdrawPassword, driverId, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -1325,13 +1434,13 @@
@ApiImplicitParam(value = "提现密码", name = "withdrawPassword", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil verificationWithdrawPassword(String withdrawPassword, HttpServletRequest request){
+ public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer language, HttpServletRequest request){
try {
Integer driverId = driverService.getUserIdFormRedis(request);
if(null == driverId){
return ResultUtil.tokenErr();
}
- return driverService.verificationWithdrawPassword(withdrawPassword, driverId);
+ return driverService.verificationWithdrawPassword(withdrawPassword, driverId, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -1372,13 +1481,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();
@@ -1405,4 +1514,30 @@
return ResultUtil.runErr();
}
}
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/updateName")
+ @ApiOperation(value = "修改姓名【1.1】", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "姓", name = "lastName", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "名", name = "firstName", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil updateName(String lastName, String firstName, HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ Driver driver = driverService.selectById(uid);
+ driver.setLastName(lastName);
+ driver.setFirstName(firstName);
+ driverService.updateById(driver);
+ return ResultUtil.success();
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
}
--
Gitblit v1.7.1