From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
index ba74390..65f5425 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
@@ -1,7 +1,7 @@
package com.ruoyi.account.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.account.WithdrawalAuditStatus;
+import com.ruoyi.other.api.enums.WithdrawalAuditStatus;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.WithdrawalRequests;
import com.ruoyi.account.service.AppUserService;
@@ -34,9 +34,6 @@
}
Integer vipId = appUser.getVipId();
R<VipSetting> r = remoteVipSettingClient.getVipSettingById(vipId);
- if (r == null || r.getCode() != R.SUCCESS) {
- throw new RuntimeException("获取会员设置信息失败");
- }
VipSetting data = r.getData();
if (data == null) {
throw new RuntimeException("会员设置信息为空");
@@ -57,7 +54,7 @@
walletVO.setAuditAmount(waitAuditList.stream()
.map(WithdrawalRequests::getWithdrawalAmount)
.reduce(BigDecimal.ZERO, BigDecimal::add));
-
+ walletVO.setBalance(appUser.getBalance());
return walletVO;
}
--
Gitblit v1.7.1