Преглед на файлове

fix 兼容旧规格座位数

zoujiajian преди 3 години
родител
ревизия
2e8f786fc8

+ 1 - 1
netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -80,7 +80,7 @@ public interface Constant {
 
 	String SUCCESS = "success";
 
-	List<Long> CHAT_GPT_SKU_IDS = List.of(161l, 168l);
+	List<Long> CHAT_GPT_SKU_IDS = List.of(161l, 178l);
 
 	List<Long> MIDJOURNEY_SKU_IDS = List.of(175l, 185l, 186l);
 }

+ 7 - 3
netflix-web/src/main/java/com/cyksj/web/controller/group/GroupController.java

@@ -48,16 +48,18 @@ public class GroupController {
                         .build());
                 List<GroupsRelationView> all = null;
                 //GPT 月付 暗改成20个 展示10个
-                if (groupsView.getSkuId().equals(Constant.CHAT_GPT_SKU_IDS.get(0))) {
+                if (groupsView.getSkuId().equals(Constant.CHAT_GPT_SKU_IDS.get(0)) && groupsView.getNum() == 20) {
                     all = relationViewList.subList(0, 5);
                     List<GroupsRelationView> after = relationViewList.subList(relationViewList.size() - 5, 20);
                     all.addAll(after);
                 }
                 //GPT 4人月付暗改成6个 展示4个
-                if (groupsView.getSkuId().equals(Constant.CHAT_GPT_SKU_IDS.get(1))) {
+                else if (groupsView.getSkuId().equals(Constant.CHAT_GPT_SKU_IDS.get(1)) && groupsView.getNum() == 6) {
                     all = relationViewList.subList(0, 2);
                     List<GroupsRelationView> after = relationViewList.subList(relationViewList.size() - 2, 6);
                     all.addAll(after);
+                }else {
+                    all = relationViewList;
                 }
                 groupsView.setRelations(all);
             } else if (Constant.MIDJOURNEY_SKU_IDS.contains(groupsView.getSkuId()) && groupsView.getNum() == 15) {
@@ -73,10 +75,12 @@ public class GroupController {
                     all.addAll(after);
                 }
                 //MIDJOURNEY 标准会员月付10个 暗改15个 展示10个
-                if (groupsView.getSkuId().equals(Constant.MIDJOURNEY_SKU_IDS.get(1)) || groupsView.getSkuId().equals(Constant.MIDJOURNEY_SKU_IDS.get(2))) {
+                else if (groupsView.getSkuId().equals(Constant.MIDJOURNEY_SKU_IDS.get(1)) || groupsView.getSkuId().equals(Constant.MIDJOURNEY_SKU_IDS.get(2))) {
                     all = relationViewList.subList(0, 5);
                     List<GroupsRelationView> after = relationViewList.subList(relationViewList.size() - 5, 15);
                     all.addAll(after);
+                }else {
+                    all =relationViewList;
                 }
                 groupsView.setRelations(all);
             } else {