From 19c35c58f8b767d7d9c57d0cf910fd091dc7669f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 27 二月 2025 16:37:08 +0800
Subject: [PATCH] 2.0新增
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TWithdrawalController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TWithdrawalController.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TWithdrawalController.java
index 457cd9c..3b5c30b 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TWithdrawalController.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TWithdrawalController.java
@@ -64,8 +64,7 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- withdrawalService.addWithdrawal(receivePaymentName, receivePaymentAccount, withdrawalType, openBank, withdrawalMoney, uid);
- return ResultUtil.success();
+ return withdrawalService.addWithdrawal(receivePaymentName, receivePaymentAccount, withdrawalType, openBank, withdrawalMoney, uid);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -105,15 +104,17 @@
@PostMapping("/queryList")
@ApiOperation(value = "提现查看分页列表", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
+ @ApiImplicitParam(value = "pageNum", name = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "size", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil queryList(HttpServletRequest request){
+ public ResultUtil queryList(Integer pageNum,Integer size,HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- Page<TWithdrawal> page = new PageFactory<TWithdrawal>().defaultPage();
+ Page<TWithdrawal> page = new Page<>(pageNum,size);
List<TWithdrawal> result = withdrawalService.queryList(page, uid);
page.setRecords(result);
return ResultUtil.success(super.packForBT(page));
@@ -141,8 +142,8 @@
}
Driver driver = driverService.selectById(uid);
Company company = companyService.selectById(driver.getCompanyId());
- BigDecimal driverRestriction = company.getDriverRestriction();
- if(driverRestriction.compareTo(new BigDecimal(driver.getBalance())) > 0){
+ Double driverRestriction = company.getDriverRestriction();
+ if(driverRestriction>driver.getBalance()){
return ResultUtil.success(0);
}else {
return ResultUtil.success(1);
--
Gitblit v1.7.1