From 1a4e7bbab3d15b36ebb4d7329ee31de62f092eb6 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:40:06 +0800
Subject: [PATCH] 小程序接口
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java
index c1a039b..80e2b19 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java
@@ -49,8 +49,7 @@
- // TODO 需要订单来查看其他金额
- @ApiOperation(value = "获取用户钱包信息",tags = {"获取用户钱包信息"})
+ @ApiOperation(value = "获取用户钱包信息",tags = {"用户钱包模块"})
@GetMapping("/getUserAccount")
public R<UserAccountVo> getUserAccount() {
UserAccountVo userAccountVo = new UserAccountVo();
@@ -58,8 +57,15 @@
TbUser user = userService.getById(loginUser.getUserId());
userAccountVo.setBalance(user.getBalance());
+ List<TbAccountDetail> list = accountDetailService.list(new LambdaQueryWrapper<TbAccountDetail>().eq(TbAccountDetail::getCategory, 1).eq(TbAccountDetail::getUserId, user.getId()));
+ BigDecimal reduce = list.stream().filter(e->e.getStatus()==2).map(TbAccountDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ userAccountVo.setWithdrawalBalance(reduce);
-
+ BigDecimal reduce1 = list.stream().filter(e->e.getStatus()==1).map(TbAccountDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ userAccountVo.setAuditBalance(reduce1);
+ List<TbAccountDetail> list1 = accountDetailService.list(new LambdaQueryWrapper<TbAccountDetail>().eq(TbAccountDetail::getCategory, 2).eq(TbAccountDetail::getStatus, 1).eq(TbAccountDetail::getUserId, user.getId()));
+ BigDecimal reduce2 = list1.stream().map(TbAccountDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ userAccountVo.setEntryBalance(reduce2);
return R.ok(userAccountVo);
}
@@ -68,7 +74,7 @@
- @ApiOperation(value = "获取用户钱包信息-收支明细",tags = {"获取用户钱包信息-收支明细"})
+ @ApiOperation(value = "获取用户钱包信息-收支明细",tags = {"用户钱包模块"})
@GetMapping("/getUserAccountDetail")
public R<Page<TbAccountDetail>> getUserAccountDetail(UserAccountDetailQuery query) {
LoginUser loginUser = tokenService.getLoginUser();
@@ -83,7 +89,7 @@
}
- @ApiOperation(value = "申请提现",tags = {"获取用户钱包信息-申请提现"})
+ @ApiOperation(value = "申请提现",tags = {"用户钱包模块"})
@PostMapping("/withdrawal")
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public R<?> withdrawal(@RequestBody @Valid UserWithdrawalDto dto) {
@@ -118,13 +124,14 @@
accountDetail.setCategory(1);
accountDetail.setStatus(1);
accountDetail.setMoney(new BigDecimal(dto.getAmount()));
+ accountDetail.setSourceId(withdrawal.getId());
accountDetailService.save(accountDetail);
return R.ok();
}
- @ApiOperation(value = "获取用户绑定的卡",tags = {"获取用户绑定的卡"})
+ @ApiOperation(value = "获取用户绑定的卡",tags = {"用户钱包模块"})
@GetMapping("/getUserBank")
public R<TbBank> getUserBank() {
LoginUser loginUser = tokenService.getLoginUser();
@@ -133,7 +140,7 @@
}
- @ApiOperation(value = "保存银行卡",tags = {"保存银行卡" })
+ @ApiOperation(value = "保存银行卡",tags = {"用户钱包模块"})
@PostMapping("/saveUserBank")
public R<?> getUserBank(@Valid @RequestBody SaveUserBankDto dto) {
LoginUser loginUser = tokenService.getLoginUser();
--
Gitblit v1.7.1