From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
index fff9df9..a918143 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
@@ -36,30 +36,24 @@
/**
* 账户余额提现操作
- * @param money
- * @param code
- * @param name
* @param request
* @return
*/
@ResponseBody
@PostMapping("/api/withdrawal/withdrawal")
- @ApiOperation(value = "账户余额提现", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "账户余额提现【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "提现金额", name = "money", required = true, dataType = "double"),
- @ApiImplicitParam(value = "银行卡号", name = "code", required = true, dataType = "string"),
- @ApiImplicitParam(value = "银行卡持有人姓名", name = "name", required = true, dataType = "string"),
- @ApiImplicitParam(value = "开户行名称", name = "bankName", required = false, dataType = "string"),
@ApiImplicitParam(value = "提现类型（1=活动收入提现，2=业务收入提现）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil withdrawal(Double money, String code, String name, Integer type,String bankName, HttpServletRequest request){
+ public ResultUtil withdrawal(Double money, Integer type, String remark, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return withdrawalService.withdrawal(money, code, name, uid, type,bankName);
+ return withdrawalService.withdrawal(money, uid, type, remark, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -75,9 +69,9 @@
*/
@ResponseBody
@PostMapping("/base/withdrawal/withdrawalAudit")
- public ResultUtil withdrawalAudit(Integer id, Integer state){
+ public ResultUtil withdrawalAudit(Integer id, Integer state, Integer language){
try {
- return withdrawalService.withdrawalAudit(id, state);
+ return withdrawalService.withdrawalAudit(id, state, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -104,13 +98,13 @@
@ApiImplicitParam(value = "提现类型（1=活动收入提现，2=业务收入提现）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<WithdrawalWarpper>> queryWithdrawal(Integer pageNum, Integer size, Integer type, HttpServletRequest request){
+ public ResultUtil<List<WithdrawalWarpper>> queryWithdrawal(Integer language, Integer pageNum, Integer size, Integer type, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = withdrawalService.queryWithdrawal(uid, type, pageNum, size);
+ List<Map<String, Object>> list = withdrawalService.queryWithdrawal(language, uid, type, pageNum, size);
return ResultUtil.success(WithdrawalWarpper.getWithdrawalWarpper(list));
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1