From 5a56fe238e5f51efe5221b5a376f109cda4b4b72 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:29:11 +0800
Subject: [PATCH] Merge branch '1.1' of http://sinata.cn:10101/gitblit/r/java/SuperSaveDriving into 1.1
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 c1e2a4a..aaee0c0 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.baomidou.mybatisplus.mapper.EntityWrapper;
import com.supersavedriving.driver.modular.system.model.Driver;
import com.supersavedriving.driver.modular.system.model.DriverBank;
@@ -25,10 +26,7 @@
import io.swagger.annotations.ApiOperation;
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.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
@@ -391,7 +389,7 @@
@ResponseBody
@PostMapping("/api/driver/queryDriverInfo")
// @ServiceLog(name = "获取司机个人信息", url = "/api/driver/queryDriverInfo")
- @ApiOperation(value = "获取司机个人信息", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "获取司机个人信息【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -902,7 +900,7 @@
@ResponseBody
@PostMapping("/api/driver/microenterprise")
// @ServiceLog(name = "绑定商户", url = "/api/driver/microenterprise")
- @ApiOperation(value = "绑定商户", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "绑定商户【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "姓名", name = "name", required = true, dataType = "String"),
@ApiImplicitParam(value = "身份证号码", name = "IDCode", required = true, dataType = "String"),
@@ -915,7 +913,7 @@
if(null == uid){
return ResponseWarpper.tokenErr();
}
- ResultUtil resultUtil = driverService.microenterprise(uid, name, IDCode, phone);
+ ResultUtil resultUtil = driverService.microenterprise(uid, name, IDCode, phone, "/base/driver/microenterpriseCallback");
return ResponseWarpper.success(resultUtil);
}catch (Exception e){
e.printStackTrace();
@@ -924,12 +922,18 @@
}
+ @ResponseBody
+ @PostMapping("/base/driver/microenterpriseCallback")
+ public void microenterpriseCallback(@RequestBody JSONObject jsonObject){
+ System.err.println(jsonObject.toJSONString());
+ }
+
@ResponseBody
@PostMapping("/api/driver/queryBank")
// @ServiceLog(name = "获取绑定的银行卡", url = "/api/driver/queryBank")
- @ApiOperation(value = "获取绑定的银行卡", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "获取绑定的银行卡【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -951,7 +955,7 @@
@ResponseBody
@PostMapping("/api/driver/addDriverBank")
// @ServiceLog(name = "绑定银行卡", url = "/api/driver/addDriverBank")
- @ApiOperation(value = "绑定银行卡", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "绑定银行卡【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "姓名", name = "name", required = true, dataType = "String"),
@ApiImplicitParam(value = "身份证号码", name = "IDCode", required = true, dataType = "String"),
@@ -977,7 +981,7 @@
@ResponseBody
@PostMapping("/api/driver/delDriverBank")
// @ServiceLog(name = "解绑银行卡", url = "/api/driver/delDriverBank")
- @ApiOperation(value = "解绑银行卡", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "解绑银行卡【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "银行卡id", name = "id", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
--
Gitblit v1.7.1