From 06f455915bb9d11caa8829942f9007809ee9ae3d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 16:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
index e6c1e7f..291de10 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
@@ -3,10 +3,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.service.BalanceChangeRecordService;
+import com.ruoyi.account.service.WalletService;
import com.ruoyi.account.vo.WalletVO;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
@@ -14,6 +17,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
@Api("钱包")
@RestController
@@ -21,17 +25,20 @@
public class WalletController extends BaseController {
@Resource
private BalanceChangeRecordService balanceChangeRecordService;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private WalletService walletService;
/**
* 钱包详情
*/
@GetMapping("detail")
@ApiOperation(value = "钱包详情", notes = "钱包详情", tags = {"小程序-个人中心-我的钱包-钱包详情"})
- public AjaxResult detail() {
- Long userId = SecurityUtils.getUserId();
- // TODO 查询钱包详情
- WalletVO walletVO = new WalletVO();
- return AjaxResult.success(walletVO);
+ public R<WalletVO> detail() {
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ WalletVO walletVO = walletService.getWalletByUserId(loginUserApplet.getUserid());
+ return R.ok(walletVO);
}
/**
@@ -39,9 +46,9 @@
*/
@ApiOperation(value = "变更明细", notes = "变更明细", tags = {"小程序-个人中心-我的钱包-变更记录"})
@GetMapping("change")
- public AjaxResult change() {
+ public R<List<BalanceChangeRecord>> change() {
Long userId = SecurityUtils.getUserId();
- return AjaxResult.success(balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()
+ return R.ok(balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()
.eq(BalanceChangeRecord::getAppUserId, userId)));
}
--
Gitblit v1.7.1