java/SuperSaveDriving.git

			@@ -1,6 +1,8 @@
			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;
			import com.supersavedriving.driver.modular.system.model.Edition;
			import com.supersavedriving.driver.modular.system.model.JoiningRequirements;
			@@ -24,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;
			@@ -161,8 +160,9 @@
			@ApiImplicitParams({
			@ApiImplicitParam(value = "国家代码+86", name = "receiver", required = true, dataType = "string"),
			@ApiImplicitParam(value = "电话号码", name = "phone", required = true, dataType = "string"),
			@ApiImplicitParam(value = "1=登录，2=注册", name = "type", required = true, dataType = "int"),
			})
			public ResponseWarpper getVerificationCode(String receiver, String phone){
			public ResponseWarpper getVerificationCode(String receiver, String phone, Integer type){
			if(ToolUtil.isEmpty(receiver)){
			return ResponseWarpper.success(ResultUtil.paranErr("receiver"));
			}
			@@ -170,6 +170,21 @@
			return ResponseWarpper.success(ResultUtil.paranErr("phone"));
			}
			try {
			if(type == 1){
			Driver driver = driverService.selectOne(new EntityWrapper<Driver>().eq("phone", phone).ne("status", 3));
			if(null == driver){
			return ResponseWarpper.success(ResultUtil.error("账号未注册"));
			}
			if(driver.getApprovalStatus() == 1){
			return ResponseWarpper.success(ResultUtil.error("账号正在审核中"));
			}
			if(driver.getApprovalStatus() == 3){
			return ResponseWarpper.success(ResultUtil.error("账号审核未通过"));
			}
			if(driver.getStatus() == 2){
			return ResponseWarpper.success(ResultUtil.error("账号已冻结"));
			}
			}
			String numberRandom = UUIDUtil.getNumberRandom(5);
			SMSUtil.send(phone, "1d0f0cbe5b214b0d8efa891730eb532a", "[\"" + numberRandom + "\"]");
			redisUtil.setStrValue(receiver + phone, numberRandom, 300);//5分钟有效期
			@@ -374,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.....")
			})
			@@ -885,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"),
			@@ -898,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();
			@@ -907,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.....")
			})
			@@ -934,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"),
			@@ -960,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.....")