From 4f58df995afbdddaf7a079eebec6d7252cd73ae4 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Wed, 28 Jan 2026 15:02:20 +0800
Subject: [PATCH] =?UTF-8?q?banner=E6=8E=A5=E5=8F=A3=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/app/sys/AppConfigRestController.java    |  4 ++--
 .../other/app/command/sys/query/BannerQryExe.java   | 13 +------------
 .../other/app/service/sys/AppConfigServiceImpl.java |  4 ++--
 .../other/app/service/sys/AppConfigService.java     |  2 +-
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/sys/AppConfigRestController.java b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/sys/AppConfigRestController.java
index c3482562..23dac0ca 100644
--- a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/sys/AppConfigRestController.java
+++ b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/sys/AppConfigRestController.java
@@ -184,11 +184,11 @@ public class AppConfigRestController extends BaseController {
    * @eo.request-type formdata
    */
   @GetMapping("/banner")
-  public List<BannerCO> listBanner(AppExtCommand cmd, @RequestParam(required = false) String bannerType) {
+  public List<BannerCO> listBanner(AppExtCommand cmd) {
       if (cmd.checkIos()) {
           return Collections.emptyList();
       }
-      return appConfigService.listBanner(cmd, bannerType);
+      return appConfigService.listBanner(cmd);
   }
 
   /**
diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/sys/query/BannerQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/sys/query/BannerQryExe.java
index 50195508..dd913337 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/sys/query/BannerQryExe.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/sys/query/BannerQryExe.java
@@ -35,7 +35,7 @@ public class BannerQryExe {
   private final SysConfigAppConvertor sysConfigAppConvertor;
   private final OrderPurchaseHistoryClient orderPurchaseHistoryClient;
 
-  public List<BannerCO> execute(AppExtCommand cmd, String bannerType) {
+  public List<BannerCO> execute(AppExtCommand cmd) {
 
     String regionId = userRegionGateway.getRegionId(cmd.requiredReqUserId());
     ResponseAssert.notBlank(CommonErrorCode.REGION_NOT_SUPPORTED_ERROR, regionId);
@@ -49,17 +49,6 @@ public class BannerQryExe {
                       bannerCache -> StringUtils.isBlank(bannerCache.getRegions()) || bannerCache.getRegions()
                               .contains(regionId))
               .toList();
-      Boolean isGoogleRecharge = orderPurchaseHistoryClient.checkIsPurchaseRechargeByUserId(cmd.requiredReqUserId()).getBody();
-      log.info("用户ID = {} isGoogleRecharge:{}", cmd.requiredReqUserId(), isGoogleRecharge);
-      if (StringUtils.isNotBlank(bannerType) && "WALLET".equals(bannerType) && !isGoogleRecharge) {
-          return Lists.newArrayList();
-      }
-      // 钱包 banner 入口,只查询 bannerType
-      if (StringUtils.isNotBlank(bannerType) && "WALLET".equals(bannerType) && isGoogleRecharge) {
-          list = list.stream()
-                  .filter(bannerCache -> bannerCache.getDisplayPosition().contains(bannerType))
-                  .toList();
-      }
       return sysConfigAppConvertor.toListBannerCO(list);
 
   }
diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/sys/AppConfigServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/sys/AppConfigServiceImpl.java
index bc93897f..b9d4adb9 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/sys/AppConfigServiceImpl.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/sys/AppConfigServiceImpl.java
@@ -87,8 +87,8 @@ public class AppConfigServiceImpl implements AppConfigService {
   }
 
   @Override
-  public List<BannerCO> listBanner(AppExtCommand cmd, String bannerType) {
-    return bannerQryExe.execute(cmd, bannerType);
+  public List<BannerCO> listBanner(AppExtCommand cmd) {
+    return bannerQryExe.execute(cmd);
   }
 
   @Override
diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/sys/AppConfigService.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/sys/AppConfigService.java
index cc449971..a16a6a1e 100644
--- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/sys/AppConfigService.java
+++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/sys/AppConfigService.java
@@ -35,7 +35,7 @@ public interface AppConfigService {
 
     UserProfileDTO getCustomerService(AppExtCommand cmd);
 
-    List<BannerCO> listBanner(AppExtCommand cmd, String bannerType);
+    List<BannerCO> listBanner(AppExtCommand cmd);
 
     List<AppStartPageCO> listAppPageStart(AppExtCommand cmd);