From 87f979fb201a82ebad5926735ed6dfa75ca004d3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 21 七月 2025 09:21:42 +0800
Subject: [PATCH] 修改bug
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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 fde4c58..19ddb64 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.StringUtils;
@@ -12,6 +13,7 @@
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.UserAccountDetailQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.GetWithdrawalDetailVo;
import com.ruoyi.system.vo.RegionVo;
import com.ruoyi.system.vo.UserAccountVo;
import io.swagger.annotations.Api;
@@ -49,17 +51,27 @@
- // TODO 需要订单来查看其他金额
@ApiOperation(value = "获取用户钱包信息",tags = {"用户钱包模块"})
@GetMapping("/getUserAccount")
public R<UserAccountVo> getUserAccount() {
UserAccountVo userAccountVo = new UserAccountVo();
LoginUser loginUser = tokenService.getLoginUser();
+ if(loginUser==null){
+ return R.fail(HttpStatus.UNAUTHORIZED,"请重新登录");
+ }
+
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);
}
@@ -72,9 +84,12 @@
@GetMapping("/getUserAccountDetail")
public R<Page<TbAccountDetail>> getUserAccountDetail(UserAccountDetailQuery query) {
LoginUser loginUser = tokenService.getLoginUser();
+ if(loginUser==null){
+ return R.fail(HttpStatus.UNAUTHORIZED,"请重新登录");
+ }
LambdaQueryWrapper<TbAccountDetail> wrapper = new LambdaQueryWrapper<>();
- if(StringUtils.isNotEmpty(query.getStartTime()) && StringUtils.isNotEmpty(query.getEndTime())){
- wrapper.between(TbAccountDetail::getCreateTime,query.getStartTime(),query.getEndTime());
+ if(StringUtils.isNotEmpty(query.getTime())){
+ wrapper.likeRight(TbAccountDetail::getCreateTime,query.getTime());
}
wrapper.eq(TbAccountDetail::getUserId,loginUser.getUserId());
wrapper.orderByDesc(TbAccountDetail::getCreateTime);
@@ -88,9 +103,12 @@
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public R<?> withdrawal(@RequestBody @Valid UserWithdrawalDto dto) {
if(dto.getAmount()<=0){
- return R.fail("提现金额不能小于0");
+ return R.fail("提现金额不能小于等于0");
}
LoginUser loginUser = tokenService.getLoginUser();
+ if(loginUser==null){
+ return R.fail(HttpStatus.UNAUTHORIZED,"请重新登录");
+ }
TbUser user = userService.getById(loginUser.getUserId());
// 判断是否有卡
List<TbBank> list = bankService.list(new LambdaQueryWrapper<TbBank>().eq(TbBank::getUserId, loginUser.getUserId()).eq(TbBank::getIsDelete, 0));
@@ -118,6 +136,7 @@
accountDetail.setCategory(1);
accountDetail.setStatus(1);
accountDetail.setMoney(new BigDecimal(dto.getAmount()));
+ accountDetail.setSourceId(withdrawal.getId());
accountDetailService.save(accountDetail);
return R.ok();
}
@@ -128,6 +147,9 @@
@GetMapping("/getUserBank")
public R<TbBank> getUserBank() {
LoginUser loginUser = tokenService.getLoginUser();
+ if(loginUser==null){
+ return R.fail(HttpStatus.UNAUTHORIZED,"请重新登录");
+ }
TbBank tbBank = bankService.getOne(new LambdaQueryWrapper<TbBank>().eq(TbBank::getUserId, loginUser.getUserId()).eq(TbBank::getIsDelete, 0));
return R.ok(tbBank);
}
@@ -137,6 +159,9 @@
@PostMapping("/saveUserBank")
public R<?> getUserBank(@Valid @RequestBody SaveUserBankDto dto) {
LoginUser loginUser = tokenService.getLoginUser();
+ if(loginUser==null){
+ return R.fail(HttpStatus.UNAUTHORIZED,"请重新登录");
+ }
TbBank tbBank = bankService.getOne(new LambdaQueryWrapper<TbBank>().eq(TbBank::getUserId, loginUser.getUserId()).eq(TbBank::getIsDelete, 0));
if(tbBank==null){
tbBank = new TbBank();
@@ -154,6 +179,18 @@
}
+ @ApiOperation(value = "提现说明需求",tags = {"用户钱包模块"})
+ @GetMapping("/getWithdrawalDetail")
+ public R<GetWithdrawalDetailVo> getWithdrawalDetail(@RequestParam String sourceId) {
+ TbWithdrawal withdrawal = withdrawalService.getById(sourceId);
+ GetWithdrawalDetailVo vo = new GetWithdrawalDetailVo();
+ vo.setImg(withdrawal.getImg());
+ vo.setRemark(withdrawal.getRemark());
+ return R.ok(vo);
+ }
+
+
+
--
Gitblit v1.7.1