Merge remote-tracking branch 'origin/master'

netflix-dao/src/main/resources/mapper/GroupsMapper.xml

@@ -46,9 +46,9 @@
         and a.expiry_time >= #{expiryTime}
         and a.expiry_time <= #{betDay}
         and (select count(*) from groups_relation gr where gr.status ='outside' and gr.groups_id = gt.id and
-        gr.user_id = 0) <=
+        gr.user_id != 0) <
         <choose>
-            <when test="isOverTen">
+            <when test="!isOverTen">
                 10
             </when>
             <otherwise>

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -1100,7 +1100,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			GroupsTrips groupsTrips = groupsMapper.selectById(relation.getGroupsId());
 			if (GroupsRelation.Status.locking.equals(relation.getStatus()) || GroupsRelation.Status.validity.equals(relation.getStatus()) || GroupsRelation.Status.outside.equals(relation.getStatus())) {
 				log.info("订单号orderNo:{}开始修改车位:{}状态", order.getOrderNo(), relation.getId());
-				relation.setStatus(GroupsRelation.Status.validity);
+				if (relation.getStatus() != GroupsRelation.Status.outside) {
+					relation.setStatus(GroupsRelation.Status.validity);
+				}
 				//续费后,下一次续费意愿状态为false
 				relation.setRenewStatus(false);
 				relation.setIsHandle(false);

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

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