From 9b79a69c09d56a8cd9b8155b2910cb4546758a9d Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 10 八月 2023 18:24:44 +0800
Subject: [PATCH] 超省司机2.0
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java | 122 +++++++++++++++++++++++++++++++++++-----
1 files changed, 105 insertions(+), 17 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 c33c28e..29bd909 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,5 +1,6 @@
package com.supersavedriving.driver.modular.system.api;
+import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -9,12 +10,11 @@
import com.supersavedriving.driver.modular.system.model.JoiningRequirements;
import com.supersavedriving.driver.modular.system.service.*;
import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceResponse;
-import com.supersavedriving.driver.modular.system.util.MallBook.model.Register;
import com.supersavedriving.driver.modular.system.util.MallBook.util.RSASignature;
-import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
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.util.juhe.OCRUtil;
import com.supersavedriving.driver.modular.system.warpper.*;
import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.util.RedisUtil;
@@ -36,6 +36,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.PrintWriter;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -147,6 +148,21 @@
try {
ResultUtil resultUtil = driverService.driverRegister(driverRegisterWarpper);
return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+ @ResponseBody
+ @PostMapping("/base/driver/orcPhoto")
+// @ServiceLog(name = "司机注册申请", url = "/base/driver/driverRegister")
+ @ApiOperation(value = "图片识别--获取驾龄", tags = {"司机端-图片识别"}, notes = "")
+ @ApiImplicitParams({
+ })
+ public ResponseWarpper orcPhoto(MultipartFile file){
+ try {
+ JSONObject certificate = OCRUtil.certificate(5, file);
+ return ResponseWarpper.success(certificate);
}catch (Exception e){
e.printStackTrace();
return new ResponseWarpper(500, e.getMessage());
@@ -313,14 +329,43 @@
@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(){
+ public ResponseWarpper< HashMap<String, Object> > queryDriverPosition(){
try {
Integer uid = driverService.getUserByRequest();
if(null == uid){
return ResponseWarpper.tokenErr();
}
- ResultUtil<List<String>> listResultUtil = driverService.queryDriverPosition(uid);
+ ResultUtil<HashMap<String, Object>> listResultUtil = driverService.queryDriverPosition(uid);
+
+
+ return ResponseWarpper.success(listResultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryDriverOrderNum")
+// @ServiceLog(name = "获取5公里范围内的司机", url = "/api/driver/queryDriverPosition")
+ @ApiOperation(value = "司机个人信息 接单量", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "时间 2022-11-11 - 2222-00-00", name = "time", required = false, dataType = "string"),
+ })
+ public ResponseWarpper< HashMap<String, Object> > queryDriverOrderNum(String time){
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil<HashMap<String, Object>> listResultUtil = driverService.queryDriverOrderNum(time,uid);
+
+
return ResponseWarpper.success(listResultUtil);
}catch (Exception e){
e.printStackTrace();
@@ -492,15 +537,16 @@
@ResponseBody
@PostMapping("/api/driver/queryCommissionList")
-// @ServiceLog(name = "获取佣金记录", url = "/api/driver/queryCommissionList")
- @ApiOperation(value = "获取佣金记录", tags = {"司机端-个人中心"}, notes = "")
+// @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(value = "类型 1订单收入 4提现 5=佣金收入，7=优惠券收入", name = "type", required = false, 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){
+ public ResponseWarpper<List<CommissionListWarpper>> queryCommissionList(String time, Integer pageNum, Integer pageSize,Integer type){
if(null == pageNum){
return ResponseWarpper.success(ResultUtil.paranErr("pageNum"));
}
@@ -512,7 +558,7 @@
if(null == uid){
return ResponseWarpper.tokenErr();
}
- List<CommissionListWarpper> list = revenueService.queryCommissionList(uid, time, pageNum, pageSize);
+ List<CommissionListWarpper> list = revenueService.queryCommissionList(uid, time, pageNum, pageSize,type);
return ResponseWarpper.success(list);
}catch (Exception e){
e.printStackTrace();
@@ -623,7 +669,7 @@
@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 = "类型（3=充值，8=保险，9=订单信息费）", 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.....")
@@ -712,7 +758,6 @@
/**
* 账户余额充值支付回调
- * @param request
* @param response
*/
@ResponseBody
@@ -883,6 +928,7 @@
}
ResultUtil resultUtil = ResultUtil.success();
phone = phone.indexOf("+86") < 0 ? "+86" + phone : phone;
+ phone = phone.indexOf("+") < 0 ? "+" + phone : phone;
String value = redisUtil.getValue(phone);
if(ToolUtil.isEmpty(value) || !value.equals(code)){
resultUtil = ResultUtil.error("验证码无效");
@@ -968,12 +1014,36 @@
/**
* 注册商户回调
- * @param jsonObject
*/
@ResponseBody
@PostMapping("/base/driver/microenterpriseCallback")
- public void microenterpriseCallback(@RequestBody JSONObject jsonObject){
- System.err.println(jsonObject.toJSONString());
+ public void microenterpriseCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){
+ try {
+ if("0000".equals(interfaceResponse.getCode())) {
+ JSONObject jsonObject = JSON.parseObject(interfaceResponse.getResult());
+ String status = jsonObject.getString("status");
+ String parameter1 = jsonObject.getString("parameter1");
+ Driver driver = driverService.selectById(parameter1);
+ if ("2".equals(status)) {
+ System.err.println("注册代理商子商户失败");
+ }
+ if ("0".equals(status)) {
+ System.err.println("注册代理商子商户处理中");
+ }
+ if ("1".equals(status)) {
+ String userId = jsonObject.getString("userId");
+ driver.setMerchantNumber(userId);
+ driverService.updateById(driver);
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
}
@@ -1054,8 +1124,17 @@
*/
@ResponseBody
@PostMapping("/base/driver/withdrawCashFZCallback")
- public void withdrawCashFZCallback(@RequestBody InterfaceResponse interfaceResponse){
- cashWithdrawalService.withdrawCashFZCallback(interfaceResponse);
+ public void withdrawCashFZCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){
+ try {
+ cashWithdrawalService.withdrawCashFZCallback(interfaceResponse);
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
}
@@ -1066,7 +1145,16 @@
*/
@ResponseBody
@PostMapping("/base/driver/withdrawCashCallback")
- public void withdrawCashCallback(@RequestBody InterfaceResponse interfaceResponse){
- cashWithdrawalService.withdrawCashCallback(interfaceResponse);
+ public void withdrawCashCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){
+ try {
+ cashWithdrawalService.withdrawCashCallback(interfaceResponse);
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.7.1