From 26ed63592331bf857e480e2a00629b6805cf7a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Tue, 30 Jul 2024 15:20:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=90=E7=8E=B0=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ss/account/domain/enums/AccountType.java | 2 +- .../ss/account/service/AccountService.java | 5 ++++ .../service/impl/AccountServiceImpl.java | 10 +++++++ .../ss/channel/service/ChannelService.java | 2 +- .../service/impl/ChannelServiceImpl.java | 29 ++++++++++++++++--- .../controller/app/AppChannelController.java | 2 +- 6 files changed, 43 insertions(+), 7 deletions(-) diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java index fde57c4f..3cfbf2f3 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java @@ -32,7 +32,7 @@ public enum AccountType { return obj; } } - throw new RuntimeException("不存在值为" + type + "的账户类型"); + return null; } public static AccountType parseByChannel(Long channelId) { diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/AccountService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/AccountService.java index d21ac2cf..376a299d 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/AccountService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/AccountService.java @@ -99,4 +99,9 @@ public interface AccountService * 查询一个 */ AccountVO selectOne(AccountQuery query); + + /** + * 根据用户查询 + */ + List selectByUserId(Long userId); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/AccountServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/AccountServiceImpl.java index ff5738cc..18642aa1 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/AccountServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/AccountServiceImpl.java @@ -201,6 +201,16 @@ public class AccountServiceImpl implements AccountService { return accountMapper.selectOne(query); } + @Override + public List selectByUserId(Long userId) { + if (userId == null) { + return Collections.emptyList(); + } + AccountQuery query = new AccountQuery(); + query.setUserId(userId); + return this.selectSmAccountList(query); + } + private boolean isRepeat(Account data) { AccountQuery dto = new AccountQuery(); dto.setUserId(data.getUserId()); diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ChannelService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ChannelService.java index fb7628c5..ed876692 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ChannelService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ChannelService.java @@ -82,6 +82,6 @@ public interface ChannelService /** * 查询启用的提现渠道列表 */ - List selectEnabledWithdrawList(); + List selectEnabledWithdrawList(Long userId); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelServiceImpl.java index 509a756e..8c72e678 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.ss.channel.service.impl; import com.ruoyi.common.utils.collection.CollectionUtils; +import com.ruoyi.ss.account.domain.AccountVO; +import com.ruoyi.ss.account.domain.enums.AccountType; +import com.ruoyi.ss.account.service.AccountService; import com.ruoyi.ss.channel.domain.Channel; import com.ruoyi.ss.channel.domain.ChannelQuery; import com.ruoyi.ss.channel.domain.ChannelVO; @@ -9,9 +12,7 @@ import com.ruoyi.ss.channel.service.ChannelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -27,6 +28,9 @@ public class ChannelServiceImpl implements ChannelService @Autowired private ChannelMapper channelMapper; + @Autowired + private AccountService accountService; + /** * 查询充值渠道 * @@ -107,9 +111,26 @@ public class ChannelServiceImpl implements ChannelService } @Override - public List selectEnabledWithdrawList() { + public List selectEnabledWithdrawList(Long userId) { + // 查询用户账户列表 + List accountList = accountService.selectByUserId(userId); + if (CollectionUtils.isEmptyElement(accountList)) { + return Collections.emptyList(); + } + // 过滤出渠道ID列表 + List channelIds = accountList.stream() + .map(item -> AccountType.parse(item.getAccountType())) + .filter(Objects::nonNull) + .map(AccountType::getChannelId) + .collect(Collectors.toList()); + if (CollectionUtils.isEmptyElement(channelIds)) { + return Collections.emptyList(); + } + + // 查询渠道列表 ChannelQuery dto = new ChannelQuery(); dto.setWithdrawEnabled(true); + dto.setChannelIds(channelIds); return this.selectSmChannelList(dto); } diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java index 36bb9617..0ed9c3a2 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java @@ -37,7 +37,7 @@ public class AppChannelController extends BaseController { @JsonView(JsonViewProfile.App.class) @GetMapping("/recharge/enabledWithdrawList") public AjaxResult getWithdrawEnabledList() { - return success(channelService.selectEnabledWithdrawList()); + return success(channelService.selectEnabledWithdrawList(getUserId())); } }