From 544d9030e6d777bc2bc88714a781c00be92d711d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 Mar 2024 16:59:05 +0800
Subject: [PATCH] =?UTF-8?q?pay=EF=BC=9A=E5=90=8E=E5=8F=B0=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=BA=94=E7=94=A8=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=9F=90=E4=B8=80=E6=B8=A0=E9=81=93=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=86=E6=98=AF=E4=BB=BB=E7=84=B6=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/app/PayAppController.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
index c7dfcfdbf..a3e6d2824 100644
--- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
+++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
@@ -1,10 +1,9 @@
 package cn.iocoder.yudao.module.pay.controller.admin.app;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
 import cn.iocoder.yudao.module.pay.controller.admin.app.vo.*;
 import cn.iocoder.yudao.module.pay.convert.app.PayAppConvert;
 import cn.iocoder.yudao.module.pay.dal.dataobject.app.PayAppDO;
@@ -14,14 +13,14 @@ import cn.iocoder.yudao.module.pay.service.channel.PayChannelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import java.util.*;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -89,9 +88,10 @@ public class PayAppController {
             return success(PageResult.empty());
         }
 
-        // 得到所有的应用编号，查出所有的渠道
-        Collection<Long> appIds = convertList(pageResult.getList(), PayAppDO::getId);
-        List<PayChannelDO> channels = channelService.getChannelListByAppIds(appIds);
+        // 得到所有的应用编号，查出所有的渠道，并移除未启用的渠道
+        List<PayChannelDO> channels = channelService.getChannelListByAppIds(
+                convertList(pageResult.getList(), PayAppDO::getId));
+        channels.removeIf(channel -> !CommonStatusEnum.ENABLE.getStatus().equals(channel.getStatus()));
 
         // 拼接后返回
         return success(PayAppConvert.INSTANCE.convertPage(pageResult, channels));