|
|
@@ -63,12 +63,22 @@ public class TabService {
|
|
|
public TabResponse homepageTab(TabRequest request) {
|
|
|
TabParam tabParam = this.requestCoverToParam(request);
|
|
|
|
|
|
- List<TabProto> tabProtos = new ArrayList<>();
|
|
|
Set<String> tabs = new HashSet<>();
|
|
|
|
|
|
+ List<TabProto> tabProtos = new ArrayList<>();
|
|
|
+
|
|
|
+ List<TabProto> territoryTabs = this.territoryTab(tabParam, tabs);
|
|
|
+
|
|
|
+ // 地域Tab
|
|
|
+ if (CollectionUtils.isNotEmpty(territoryTabs)){
|
|
|
+ tabProtos.addAll(territoryTabs);
|
|
|
+ }
|
|
|
+
|
|
|
+ // 个性化Tab
|
|
|
List<TabProto> personalizationTabs = this.personalizationTab(tabParam, tabs);
|
|
|
- tabProtos.addAll(this.territoryTab(tabParam, tabs));
|
|
|
- tabProtos.addAll(personalizationTabs);
|
|
|
+ if (CollectionUtils.isNotEmpty(personalizationTabs)) {
|
|
|
+ tabProtos.addAll(personalizationTabs.subList(0, Math.min(personalizationTabs.size(), personalizationTabSize)));
|
|
|
+ }
|
|
|
|
|
|
return TabResponse.newBuilder()
|
|
|
.setResult(Result.newBuilder().setCode(1).setMessage("success"))
|