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 | 168 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 109 insertions(+), 59 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 97f1fe5..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
@@ -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,10 +9,7 @@
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.ResultUtil;
@@ -80,6 +78,9 @@
@Value("${share.url}")
private String shareUrl;
+
+ @Autowired
+ private TEmailService emailService;
@@ -184,12 +185,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, Integer language){
+ public ResultUtil checkCaptcha(String email, String phone, String code, Integer language){
try {
- boolean b = driverService.checkCaptcha(email, code);
- return b ? ResultUtil.success() : ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ 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();
@@ -220,6 +231,20 @@
}
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){
@@ -256,6 +281,20 @@
}
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){
@@ -328,6 +367,25 @@
}
}
+
+ @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<?> getEmailList(HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(emailService.selectList(new EntityWrapper<TEmail>().eq("userId",uid).eq("type",2).orderBy("createTime",false)));
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
/**
@@ -438,7 +496,6 @@
}
}
-
/**
* 获取忘记密码页面的电话
* @return
@@ -502,20 +559,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();
}
}
-
/**
* 司机上下班操作
@@ -597,7 +653,6 @@
}
}
-
@ResponseBody
@PostMapping("/api/driver/work2")
@ApiOperation(value = "司机上下班操作,同时设置接单类型【1.0】", tags = {"司机端-车载端"}, notes = "")
@@ -618,28 +673,25 @@
}
}
-
@ResponseBody
@PostMapping("/api/driver/queryHomeNum")
@ApiOperation(value = "获取首页统计数据", tags = {"司机端-车载端"}, notes = "")
@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();
}
}
-
-
/**
* 上班时选择的业务类型
@@ -652,14 +704,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<>();
@@ -674,7 +726,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 存储订单服务中的司机位置
@@ -693,26 +744,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();
}
}
-
-
-
/**
* 获取个人中心详情
@@ -725,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);
@@ -743,7 +789,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 修改手机号码
@@ -774,6 +819,20 @@
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();
@@ -802,8 +861,6 @@
}
}
-
-
/**
* 修改密码
* @param password
@@ -831,7 +888,6 @@
}
}
-
/**
* 获取设置接单的业务类型列表
* @param request
@@ -843,13 +899,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){
@@ -865,10 +921,6 @@
return ResultUtil.runErr();
}
}
-
-
-
-
/**
* 设置接单规则
@@ -896,7 +948,6 @@
}
}
-
/**
* 获取当前车辆及空闲车辆
* @param request
@@ -921,7 +972,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 更换车辆
@@ -990,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();
@@ -1028,19 +1078,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);
@@ -1066,13 +1116,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();
@@ -1080,19 +1130,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<>();
@@ -1166,13 +1216,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();
@@ -1223,14 +1273,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();
@@ -1417,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