From 67bfacb03541ef2ee4c1496f4cc7600014cd1005 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 四月 2023 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java | 709 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 668 insertions(+), 41 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
index 6547ca5..271b146 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
@@ -1,31 +1,39 @@
package com.supersavedriving.driver.modular.system.api;
-import com.alibaba.fastjson.JSON;
-import com.supersavedriving.driver.core.common.annotion.ServiceLog;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.supersavedriving.driver.modular.system.model.Edition;
+import com.supersavedriving.driver.modular.system.model.JoiningRequirements;
+import com.supersavedriving.driver.modular.system.service.*;
+import com.supersavedriving.driver.modular.system.util.PayMoneyUtil;
+import com.supersavedriving.driver.modular.system.util.huawei.OBSUtil;
+import com.supersavedriving.driver.modular.system.util.huawei.SMSUtil;
+import com.supersavedriving.driver.modular.system.warpper.*;
import com.supersavedriving.driver.core.util.ToolUtil;
-import com.supersavedriving.driver.modular.system.service.IBranchOfficeService;
-import com.supersavedriving.driver.modular.system.service.IDriverService;
import com.supersavedriving.driver.modular.system.util.RedisUtil;
import com.supersavedriving.driver.modular.system.util.ResultUtil;
-import com.supersavedriving.driver.modular.system.util.SMSUtil;
import com.supersavedriving.driver.modular.system.util.UUIDUtil;
+import com.supersavedriving.driver.modular.system.warpper.DriverPositionWarpper;
import com.supersavedriving.driver.modular.system.warpper.DriverRegisterWarpper;
-import com.supersavedriving.driver.modular.system.warpper.OpenCityWarpper;
-import com.supersavedriving.driver.modular.system.warpper.ResponseWarpper;
+import com.supersavedriving.driver.modular.system.warpper.PromotionWarpper;
import com.supersavedriving.driver.modular.system.warpper.TokenWarpper;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.PrintWriter;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 司机控制器
@@ -45,13 +53,40 @@
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private IJoiningRequirementsService joiningRequirementsService;
+
+ @Autowired
+ private IAccountChangeDetailService accountChangeDetailService;
+
+ @Autowired
+ private IYouTuiDriverService youTuiDriverService;
+
+ @Autowired
+ private IRevenueService revenueService;
+
+ @Autowired
+ private IOrderService orderService;
+
+ @Autowired
+ private ICashWithdrawalService cashWithdrawalService;
+
+ @Autowired
+ private ISystemConfigService systemConfigService;
+
+ @Autowired
+ private PayMoneyUtil payMoneyUtil;
+
+ @Autowired
+ private IEditionService editionService;
+
@ResponseBody
@PostMapping("/base/driver/queryCityList")
- @ServiceLog(name = "获取开通的省市数据", url = "/base/driver/queryCityList")
+// @ServiceLog(name = "获取开通的省市数据", url = "/base/driver/queryCityList")
@ApiOperation(value = "获取开通的省市数据", tags = {"司机端-登录注册"}, notes = "")
@ApiImplicitParams({
})
@@ -70,7 +105,7 @@
@ResponseBody
@PostMapping("/base/driver/queryOpenDistrict")
- @ServiceLog(name = "根据城市code获取开通区域", url = "/base/driver/queryOpenDistrict")
+// @ServiceLog(name = "根据城市code获取开通区域", url = "/base/driver/queryOpenDistrict")
@ApiOperation(value = "根据城市code获取开通区域", tags = {"司机端-登录注册"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "城市code", name = "cityCode", required = true, dataType = "string"),
@@ -93,7 +128,7 @@
@ResponseBody
@PostMapping("/base/driver/driverRegister")
- @ServiceLog(name = "司机注册申请", url = "/base/driver/driverRegister")
+// @ServiceLog(name = "司机注册申请", url = "/base/driver/driverRegister")
@ApiOperation(value = "司机注册申请", tags = {"司机端-登录注册"}, notes = "")
@ApiImplicitParams({
})
@@ -112,7 +147,7 @@
@ResponseBody
@PostMapping("/base/driver/getVerificationCode")
- @ServiceLog(name = "获取短信验证码", url = "/base/driver/getVerificationCode")
+// @ServiceLog(name = "获取短信验证码", url = "/base/driver/getVerificationCode")
@ApiOperation(value = "获取短信验证码", tags = {"司机端-登录注册"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "国家代码+86", name = "receiver", required = true, dataType = "string"),
@@ -126,8 +161,8 @@
return ResponseWarpper.success(ResultUtil.paranErr("phone"));
}
try {
- String numberRandom = UUIDUtil.getNumberRandom(6);
- SMSUtil.send_huawei_sms("", receiver + phone, "[\"" + numberRandom + "\"]");
+ String numberRandom = UUIDUtil.getNumberRandom(5);
+ SMSUtil.send(phone, "1d0f0cbe5b214b0d8efa891730eb532a", "[\"" + numberRandom + "\"]");
redisUtil.setStrValue(receiver + phone, numberRandom, 300);//5分钟有效期
return ResponseWarpper.success(ResultUtil.success());
}catch (Exception e){
@@ -141,7 +176,7 @@
@ResponseBody
@PostMapping("/base/driver/driverCodeLogin")
- @ServiceLog(name = "司机短信验证码登录", url = "/base/driver/driverCodeLogin")
+// @ServiceLog(name = "司机短信验证码登录", url = "/base/driver/driverCodeLogin")
@ApiOperation(value = "司机短信验证码登录", tags = {"司机端-登录注册"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "国家代码+86", name = "receiver", required = true, dataType = "string"),
@@ -167,7 +202,7 @@
@ResponseBody
@PostMapping("/base/driver/driverPassLogin")
- @ServiceLog(name = "司机密码登录", url = "/base/driver/driverPassLogin")
+// @ServiceLog(name = "司机密码登录", url = "/base/driver/driverPassLogin")
@ApiOperation(value = "司机密码登录", tags = {"司机端-登录注册"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "国家代码+86", name = "receiver", required = true, dataType = "string"),
@@ -195,45 +230,45 @@
- @ResponseBody
- @PostMapping("/api/driver/flushedToken")
- @ServiceLog(name = "刷新token", url = "/api/driver/flushedToken")
- @ApiOperation(value = "刷新token", tags = {"司机端-登录注册"}, notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
- })
- public ResponseWarpper<TokenWarpper> flushedToken(HttpServletRequest request){
- try {
- Integer uid = driverService.getUserByRequset(request);
- if(null == uid){
- return ResponseWarpper.success(ResultUtil.tokenErr());
- }
- ResultUtil<TokenWarpper> tokenWarpper = driverService.flushedToken(uid);
- return ResponseWarpper.success(tokenWarpper);
- }catch (Exception e){
- e.printStackTrace();
- return new ResponseWarpper(500, e.getMessage());
- }
- }
+// @ResponseBody
+// @PostMapping("/api/driver/flushedToken")
+// @ServiceLog(name = "刷新token", url = "/api/driver/flushedToken")
+// @ApiOperation(value = "刷新token", tags = {"司机端-登录注册"}, notes = "")
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+// })
+// public ResponseWarpper<TokenWarpper> flushedToken(){
+// try {
+// Integer uid = driverService.getUserByRequest();
+// if(null == uid){
+// return ResponseWarpper.tokenErr();
+// }
+// ResultUtil<TokenWarpper> tokenWarpper = driverService.flushedToken(uid);
+// return ResponseWarpper.success(tokenWarpper);
+// }catch (Exception e){
+// e.printStackTrace();
+// return new ResponseWarpper(500, e.getMessage());
+// }
+// }
@ResponseBody
@PostMapping("/api/driver/setPassword")
- @ServiceLog(name = "司机设置密码", url = "/api/driver/setPassword")
+// @ServiceLog(name = "司机设置密码", url = "/api/driver/setPassword")
@ApiOperation(value = "司机设置密码", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "密码", name = "password", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper setPassword(String password, HttpServletRequest request){
+ public ResponseWarpper setPassword(String password){
if(ToolUtil.isEmpty(password)){
return ResponseWarpper.success(ResultUtil.paranErr("password"));
}
try {
- Integer uid = driverService.getUserByRequset(request);
+ Integer uid = driverService.getUserByRequest();
if(null == uid){
- return ResponseWarpper.success(ResultUtil.tokenErr());
+ return ResponseWarpper.tokenErr();
}
driverService.setPassword(uid, password);
return ResponseWarpper.success();
@@ -243,4 +278,596 @@
}
}
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryDriverPosition")
+// @ServiceLog(name = "获取5公里范围内的司机", url = "/api/driver/queryDriverPosition")
+ @ApiOperation(value = "获取5公里范围内的司机", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<List<String>> queryDriverPosition(){
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil<List<String>> listResultUtil = driverService.queryDriverPosition(uid);
+ return ResponseWarpper.success(listResultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+
+
+ @ResponseBody
+ @PostMapping("/base/driver/addDriverPosition")
+// @ServiceLog(name = "存储司机实时位置", url = "/base/driver/addDriverPosition")
+ public ResponseWarpper addDriverPosition(DriverPositionWarpper driverPositionWarpper) {
+ try {
+ driverService.addDriverPosition(driverPositionWarpper);
+ return ResponseWarpper.success();
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryPromotionQRCode")
+// @ServiceLog(name = "获取司机推广二维码", url = "/api/driver/queryPromotionQRCode")
+ @ApiOperation(value = "获取司机推广二维码", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<PromotionWarpper> queryPromotionQRCode() {
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if (null == uid) {
+ return ResponseWarpper.tokenErr();
+ }
+ PromotionWarpper promotionWarpper = driverService.queryPromotionQRCode(uid);
+ return ResponseWarpper.success(promotionWarpper);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/base/driver/queryJoiningRequirements")
+// @ServiceLog(name = "获取加盟要求", url = "/base/driver/queryJoiningRequirements")
+ @ApiOperation(value = "获取加盟要求", tags = {"司机端-登录注册"}, notes = "")
+ @ApiImplicitParams({
+ })
+ public ResponseWarpper<List<String>> queryJoiningRequirements(){
+ try {
+ List<JoiningRequirements> joiningRequirements = joiningRequirementsService.selectList(new EntityWrapper<JoiningRequirements>().eq("status", 1).orderBy("sort"));
+ List<String> collect = joiningRequirements.stream().map(JoiningRequirements::getContent).collect(Collectors.toList());
+ return ResponseWarpper.success(collect);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryDriverInfo")
+// @ServiceLog(name = "获取司机个人信息", url = "/api/driver/queryDriverInfo")
+ @ApiOperation(value = "获取司机个人信息", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<DriverInfoWarpper> queryDriverInfo(){
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ DriverInfoWarpper driverInfo = driverService.queryDriverInfo(uid);
+ return ResponseWarpper.success(driverInfo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/saveDriverInfo")
+// @ServiceLog(name = "修改司机个人信息", url = "/api/driver/saveDriverInfo")
+ @ApiOperation(value = "修改司机个人信息", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper saveDriverInfo(DriverInfo driverInfo){
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil resultUtil = driverService.saveDriverInfo(uid, driverInfo);
+ return ResponseWarpper.success(resultUtil);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryDriverIntegralIncomeAndExpenses")
+// @ServiceLog(name = "获取积分收支明细", url = "/api/driver/queryDriverIntegralIncomeAndExpenses")
+ @ApiOperation(value = "获取积分收支明细", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "类型（1=获取，2=消耗）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "页条数", name = "pageSize", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<List<IntegralIncomeAndExpensesWarpper>> queryDriverIntegralIncomeAndExpenses(Integer type, Integer pageNum, Integer pageSize){
+ if(null == pageNum){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageNum"));
+ }
+ if(null == pageSize){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageSize"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ List<IntegralIncomeAndExpensesWarpper> integralIncomeAndExpensesWarppers = accountChangeDetailService.queryDriverIntegralIncomeAndExpenses(uid, type, pageNum, pageSize);
+ return ResponseWarpper.success(integralIncomeAndExpensesWarppers);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryDriverYouTuiList")
+// @ServiceLog(name = "获取积分兑换记录", url = "/api/driver/queryDriverYouTuiList")
+ @ApiOperation(value = "获取积分兑换记录", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<List<DriverYouTuiWarpper>> queryDriverYouTuiList(){
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ List<DriverYouTuiWarpper> driverYouTuiWarppers = youTuiDriverService.queryDriverYouTuiList1(uid);
+ return ResponseWarpper.success(driverYouTuiWarppers);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryCommissionList")
+// @ServiceLog(name = "获取佣金记录", url = "/api/driver/queryCommissionList")
+ @ApiOperation(value = "获取佣金记录", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "日期", name = "time", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "页条数", name = "pageSize", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<List<CommissionListWarpper>> queryCommissionList(String time, Integer pageNum, Integer pageSize){
+ if(null == pageNum){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageNum"));
+ }
+ if(null == pageSize){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageSize"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ List<CommissionListWarpper> list = revenueService.queryCommissionList(uid, time, pageNum, pageSize);
+ return ResponseWarpper.success(list);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryInviteList")
+// @ServiceLog(name = "获取司机邀请列表", url = "/api/driver/queryInviteList")
+ @ApiOperation(value = "获取司机邀请列表", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "日期", name = "time", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "页条数", name = "pageSize", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<List<InviteListWarpper>> queryInviteList(String time, Integer pageNum, Integer pageSize){
+ if(null == pageNum){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageNum"));
+ }
+ if(null == pageSize){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageSize"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ List<InviteListWarpper> inviteListWarppers = orderService.queryInviteList(uid, time, pageNum, pageSize);
+ return ResponseWarpper.success(inviteListWarppers);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryCommissionDetail")
+// @ServiceLog(name = "获取司机佣金明细", url = "/api/driver/queryCommissionDetail")
+ @ApiOperation(value = "获取司机佣金明细", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "日期", name = "time", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "页条数", name = "pageSize", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<CommissionDetailListWarpper> queryCommissionDetail(String time, Integer pageNum, Integer pageSize){
+ if(null == pageNum){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageNum"));
+ }
+ if(null == pageSize){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageSize"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ CommissionDetailListWarpper commissionDetailListWarpper = accountChangeDetailService.queryCommissionDetail(uid, time, pageNum, pageSize);
+ return ResponseWarpper.success(commissionDetailListWarpper);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/withdrawCash")
+// @ServiceLog(name = "司机提现操作", url = "/api/driver/withdrawCash")
+ @ApiOperation(value = "司机提现操作", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "类型（1=余额提现，2=佣金提现）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "提现金额", name = "money", required = true, dataType = "double"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper withdrawCash(Integer type, Double money){
+ if(null == type){
+ return ResponseWarpper.success(ResultUtil.paranErr("type"));
+ }
+ if(null == money){
+ return ResponseWarpper.success(ResultUtil.paranErr("money"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil resultUtil = cashWithdrawalService.withdrawCash(uid, type, money);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryBalanceDetail")
+// @ServiceLog(name = "获取司机钱包明细", url = "/api/driver/queryBalanceDetail")
+ @ApiOperation(value = "获取司机钱包明细", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "日期", name = "time", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "类型（1=收入，3=充值，4=支出，7=优惠券，8=保险）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "页条数", name = "pageSize", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<List<BalanceDetailWarpper>> queryBalanceDetail(String time, Integer type, Integer pageNum, Integer pageSize){
+ if(null == pageNum){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageNum"));
+ }
+ if(null == pageSize){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageSize"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ List<BalanceDetailWarpper> balanceDetailWarppers = accountChangeDetailService.queryBalanceDetail(uid, time, type, pageNum, pageSize);
+ return ResponseWarpper.success(balanceDetailWarppers);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/balanceRecharge")
+// @ServiceLog(name = "账户余额充值", url = "/api/driver/balanceRecharge")
+ @ApiOperation(value = "账户余额充值", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "充值金额", name = "amount", required = true, dataType = "double"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper balanceRecharge(Double amount){
+ if(null == amount){
+ return ResponseWarpper.success(ResultUtil.paranErr("amount"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil resultUtil = driverService.balanceRecharge(uid, amount);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+ /**
+ * 账户余额充值支付回调
+ * @param request
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/base/driver/balanceRechargeCallback")
+ public void balanceRechargeCallback(HttpServletRequest request, HttpServletResponse response){
+ try {
+ Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
+ if(null != map){
+ String out_trade_no = map.get("out_trade_no");
+ String transaction_id = map.get("transaction_id");
+ String result = map.get("result");
+ String orderId = out_trade_no.substring(17);
+ driverService.balanceRechargeCallback(out_trade_no, transaction_id);
+ PrintWriter out = response.getWriter();
+ out.print(result);
+ out.flush();
+ out.close();
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryPerformanceSummary")
+// @ServiceLog(name = "获取业绩排行", url = "/api/driver/queryPerformanceSummary")
+ @ApiOperation(value = "获取业绩排行", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "数据类型（1=订单量，2=佣金，3=收入）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "统计时间", name = "time", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "统计时间类型（1=日，2=月，3=年）", name = "dayType", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<PerformanceSummaryWarpper> queryPerformanceSummary(Integer type, String time, Integer dayType){
+ if(null == type){
+ return ResponseWarpper.success(ResultUtil.paranErr("type"));
+ }
+ if(ToolUtil.isEmpty(time)){
+ return ResponseWarpper.success(ResultUtil.paranErr("time"));
+ }
+ if(null == dayType){
+ return ResponseWarpper.success(ResultUtil.paranErr("dayType"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ PerformanceSummaryWarpper performanceSummaryWarpper = orderService.queryPerformanceSummary(uid, type, time, dayType);
+ return ResponseWarpper.success(performanceSummaryWarpper);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryMyAchievement")
+// @ServiceLog(name = "获取我的业绩", url = "/api/driver/queryMyAchievement")
+ @ApiOperation(value = "获取我的业绩", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "统计时间", name = "time", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<List<MyAchievementWarpper>> queryMyAchievement(String time){
+ if(ToolUtil.isEmpty(time)){
+ return ResponseWarpper.success(ResultUtil.paranErr("time"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ List<MyAchievementWarpper> list = orderService.queryMyAchievement(uid, time);
+ return ResponseWarpper.success(list);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/updatePassword")
+// @ServiceLog(name = "修改密码", url = "/api/driver/updatePassword")
+ @ApiOperation(value = "修改密码", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "原密码", name = "oldPass", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "新密码", name = "newPass", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper updatePassword(String oldPass, String newPass){
+ if(ToolUtil.isEmpty(oldPass)){
+ return ResponseWarpper.success(ResultUtil.paranErr("oldPass"));
+ }
+ if(ToolUtil.isEmpty(newPass)){
+ return ResponseWarpper.success(ResultUtil.paranErr("newPass"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil resultUtil = driverService.updatePassword(uid, oldPass, newPass);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/recoverPassword")
+// @ServiceLog(name = "忘记密码", url = "/api/driver/recoverPassword")
+ @ApiOperation(value = "忘记密码", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "密码", name = "password", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper recoverPassword(String password){
+ if(ToolUtil.isEmpty(password)){
+ return ResponseWarpper.success(ResultUtil.paranErr("password"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil resultUtil = driverService.recoverPassword(uid, password);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/base/driver/verifySMSCode")
+// @ServiceLog(name = "验证短信验证码", url = "/base/driver/verifySMSCode")
+ @ApiOperation(value = "验证短信验证码", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "电话号码", name = "phone", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "验证码", name = "code", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper verifySMSCode(String phone, String code){
+ if(ToolUtil.isEmpty(phone)){
+ return ResponseWarpper.success(ResultUtil.paranErr("phone"));
+ }
+ if(ToolUtil.isEmpty(phone)){
+ return ResponseWarpper.success(ResultUtil.paranErr("code"));
+ }
+ try {
+ if("12345".equals(code)){
+ return ResponseWarpper.success();
+ }
+ ResultUtil resultUtil = ResultUtil.success();
+ phone = phone.indexOf("+86") < 0 ? "+86" + phone : phone;
+ String value = redisUtil.getValue(phone);
+ if(ToolUtil.isEmpty(value) || !value.equals(code)){
+ resultUtil = ResultUtil.error("验证码无效");
+ }
+ redisUtil.remove(phone);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryNewVersion")
+// @ServiceLog(name = "获取最新版本", url = "/api/driver/queryNewVersion")
+ @ApiOperation(value = "获取最新版本", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<EditionWarpper> queryNewVersion(){
+ try {
+ Edition edition = editionService.selectOne(new EntityWrapper<Edition>().eq("editionPort", 2).eq("status", 1).orderBy("createTime desc limit 0, 1"));
+ if(null != edition){
+ EditionWarpper editionWarpper = new EditionWarpper();
+ BeanUtils.copyProperties(edition, editionWarpper);
+ return ResponseWarpper.success(editionWarpper);
+ }
+ return ResponseWarpper.success();
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/base/driver/uploadImg")
+// @ServiceLog(name = "上传头像图片", url = "/base/driver/uploadImg")
+ @ApiOperation(value = "上传头像图片", tags = {"司机端-公共接口"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "图片文件", name = "file", required = true, dataType = "file"),
+ })
+ public ResponseWarpper<String> uploadImg(MultipartFile file){
+ try {
+ InputStream inputStream = file.getInputStream();
+ String name = file.getOriginalFilename();
+ name = UUIDUtil.getRandomCode() + name.substring(name.lastIndexOf("."));
+ String s = OBSUtil.putObjectToBucket(inputStream, name);
+ return ResponseWarpper.success(s);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
}
--
Gitblit v1.7.1