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 listBanner(AppExtCommand cmd, @RequestParam(required = false) String bannerType) { + public List 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 execute(AppExtCommand cmd, String bannerType) { + public List 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 listBanner(AppExtCommand cmd, String bannerType) { - return bannerQryExe.execute(cmd, bannerType); + public List 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 listBanner(AppExtCommand cmd, String bannerType); + List listBanner(AppExtCommand cmd); List listAppPageStart(AppExtCommand cmd);