hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

banner接口 优化

Browse Source
This commit is contained in:
tianfeng 2026-01-28 15:02:20 +08:00
parent 48c6cce5ed
commit 4f58df995a
4 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/sys/AppConfigRestController.java
View File

@ -184,11 +184,11 @@ public class AppConfigRestController extends BaseController {
* @eo.request-type formdata * @eo.request-type formdata
*/ */
@GetMapping("/banner") @GetMapping("/banner")
public List<BannerCO> listBanner(AppExtCommand cmd, @RequestParam(required = false) String bannerType) { public List<BannerCO> listBanner(AppExtCommand cmd) {
if (cmd.checkIos()) { if (cmd.checkIos()) {
return Collections.emptyList(); return Collections.emptyList();
} }
return appConfigService.listBanner(cmd, bannerType); return appConfigService.listBanner(cmd);
} }
/** /**

13
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/sys/query/BannerQryExe.java
View File

@ -35,7 +35,7 @@ public class BannerQryExe {
private final SysConfigAppConvertor sysConfigAppConvertor; private final SysConfigAppConvertor sysConfigAppConvertor;
private final OrderPurchaseHistoryClient orderPurchaseHistoryClient; private final OrderPurchaseHistoryClient orderPurchaseHistoryClient;
public List<BannerCO> execute(AppExtCommand cmd, String bannerType) { public List<BannerCO> execute(AppExtCommand cmd) {
String regionId = userRegionGateway.getRegionId(cmd.requiredReqUserId()); String regionId = userRegionGateway.getRegionId(cmd.requiredReqUserId());
ResponseAssert.notBlank(CommonErrorCode.REGION_NOT_SUPPORTED_ERROR, regionId); ResponseAssert.notBlank(CommonErrorCode.REGION_NOT_SUPPORTED_ERROR, regionId);
@ -49,17 +49,6 @@ public class BannerQryExe {
bannerCache -> StringUtils.isBlank(bannerCache.getRegions()) || bannerCache.getRegions() bannerCache -> StringUtils.isBlank(bannerCache.getRegions()) || bannerCache.getRegions()
.contains(regionId)) .contains(regionId))
.toList(); .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); return sysConfigAppConvertor.toListBannerCO(list);
} }

4
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/sys/AppConfigServiceImpl.java
View File

@ -87,8 +87,8 @@ public class AppConfigServiceImpl implements AppConfigService {
} }
@Override @Override
public List<BannerCO> listBanner(AppExtCommand cmd, String bannerType) { public List<BannerCO> listBanner(AppExtCommand cmd) {
return bannerQryExe.execute(cmd, bannerType); return bannerQryExe.execute(cmd);
} }
@Override @Override

2
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/sys/AppConfigService.java
View File

@ -35,7 +35,7 @@ public interface AppConfigService {
UserProfileDTO getCustomerService(AppExtCommand cmd); UserProfileDTO getCustomerService(AppExtCommand cmd);
List<BannerCO> listBanner(AppExtCommand cmd, String bannerType); List<BannerCO> listBanner(AppExtCommand cmd);
List<AppStartPageCO> listAppPageStart(AppExtCommand cmd); List<AppStartPageCO> listAppPageStart(AppExtCommand cmd);