fix 删除车队恢复校验

netflix-service/src/main/java/com/cyksj/service/mange/group/CmsGroupServiceImpl.java

@@ -119,38 +119,41 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
         }
         Integer count = relationMapper.selectCount(Wrappers.lambdaQuery(GroupsRelation.class)
                 .eq(GroupsRelation::getGroupsId, groupId)
-                .in(GroupsRelation::getStatus, List.of(GroupsRelation.Status.locking, GroupsRelation.Status.validity)));
-        //可强制删除
-        //后台记录
+                .ne(GroupsRelation::getStatus, GroupsRelation.Status.none));
         if (count > 0) {
-            List<GroupsRelation> groupsRelations = relationMapper.selectList(Wrappers.lambdaQuery(GroupsRelation.class)
-                    .eq(GroupsRelation::getGroupsId, groupId)
-                    .in(GroupsRelation::getStatus, List.of(GroupsRelation.Status.locking, GroupsRelation.Status.validity)));
-            if (groupsRelations.size() > 0) {
-                Account account = accountMapper.selectById(groupsTrips.getAccountId());
-                TASK_EXECUTOR.execute(() -> {
-                    if (redisService.setNx(String.format("%s-%s", groupId, groupsTrips.getAccount()), groupId, 10l)) {
-                        groupsRelations.forEach(data -> {
-                            DelGroupsTripsRecord delGroupsTripsRecord = new DelGroupsTripsRecord();
-                            delGroupsTripsRecord.setGroupsId(groupId);
-                            delGroupsTripsRecord.setGroupsStatus(groupsTrips.getStatus().name());
-                            if (account != null) {
-                                delGroupsTripsRecord.setAccount(account.getAccount());
-                                delGroupsTripsRecord.setPassword(account.getPassword());
-                            }
-                            delGroupsTripsRecord.setRelationId(data.getId());
-                            delGroupsTripsRecord.setSkuId(groupsTrips.getSkuId());
-                            delGroupsTripsRecord.setUserId(data.getUserId());
-                            delGroupsTripsRecord.setStartTime(data.getStartTime());
-                            delGroupsTripsRecord.setExpiryTime(data.getExpiryTime());
-                            delGroupsTripsRecord.setRelationStatus(data.getStatus().name());
-                            delGroupsTripsRecord.setType("delete");
-                            delGroupsTripsRecordMapper.insert(delGroupsTripsRecord);
-                        });
-                    }
-                });
-            }
+            throw BusinessRuntimeException.getInstance("请移除该车队下的用户再进行删掉操作");
         }
+        //可强制删除
+        //后台记录
+//        if (count > 0) {
+//            List<GroupsRelation> groupsRelations = relationMapper.selectList(Wrappers.lambdaQuery(GroupsRelation.class)
+//                    .eq(GroupsRelation::getGroupsId, groupId)
+//                    .ne(GroupsRelation::getStatus, GroupsRelation.Status.none));
+//            if (groupsRelations.size() > 0) {
+//                Account account = accountMapper.selectById(groupsTrips.getAccountId());
+//                TASK_EXECUTOR.execute(() -> {
+//                    if (redisService.setNx(String.format("%s-%s", groupId, groupsTrips.getAccount()), groupId, 10l)) {
+//                        groupsRelations.forEach(data -> {
+//                            DelGroupsTripsRecord delGroupsTripsRecord = new DelGroupsTripsRecord();
+//                            delGroupsTripsRecord.setGroupsId(groupId);
+//                            delGroupsTripsRecord.setGroupsStatus(groupsTrips.getStatus().name());
+//                            if (account != null) {
+//                                delGroupsTripsRecord.setAccount(account.getAccount());
+//                                delGroupsTripsRecord.setPassword(account.getPassword());
+//                            }
+//                            delGroupsTripsRecord.setRelationId(data.getId());
+//                            delGroupsTripsRecord.setSkuId(groupsTrips.getSkuId());
+//                            delGroupsTripsRecord.setUserId(data.getUserId());
+//                            delGroupsTripsRecord.setStartTime(data.getStartTime());
+//                            delGroupsTripsRecord.setExpiryTime(data.getExpiryTime());
+//                            delGroupsTripsRecord.setRelationStatus(data.getStatus().name());
+//                            delGroupsTripsRecord.setType("delete");
+//                            delGroupsTripsRecordMapper.insert(delGroupsTripsRecord);
+//                        });
+//                    }
+//                });
+//            }
+//        }
         relationMapper.delete(Wrappers.lambdaQuery(GroupsRelation.class).eq(GroupsRelation::getGroupsId,groupId));
         this.removeById(groupId);
     }