From d7ae538c8f683e97343c3a6bcca32861ed8a0033 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 09 八月 2023 19:33:12 +0800
Subject: [PATCH] 修改bug和日志时间
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 2e95e94..7dfebc5 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
@@ -9,9 +9,7 @@
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;
@@ -492,8 +490,8 @@
@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"),
@@ -623,7 +621,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.....")
@@ -870,6 +868,7 @@
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResponseWarpper verifySMSCode(String phone, String code){
+ System.err.println("验证短信" + phone);
if(ToolUtil.isEmpty(phone)){
return ResponseWarpper.success(ResultUtil.paranErr("phone"));
}
@@ -882,6 +881,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("验证码无效");
--
Gitblit v1.7.1