fix bug 绑定店铺且已过期的 ip 显示 grouptype为5的 ip列表中

src/main/java/com/edgec/browserbackend/browser/repository/IpResourceRepositoryCustomImpl.java

@@ -134,15 +134,17 @@ public class IpResourceRepositoryCustomImpl implements IpResourceRepositoryCusto
     public boolean updateStatus(String id, int status, Object... args) {
         Document doc = new Document();
         BasicQuery basicQuery = new BasicQuery(doc);
+        basicQuery.addCriteria(where("id").is(id).and("isDeleted").is(false));
+
+        Update update = new Update();
+
         if (args.length == 0) {
-            basicQuery.addCriteria(where("id").is(id).and("isDeleted").is(false));
+            update.set("status", status);
         }
         if (args.length == 1) {
-            basicQuery.addCriteria(where("id").is(id).and("isDeleted").is(true));
+            update.set("status", status).set("isDeleted", true);
         }
 
-        Update update = new Update();
-        update.set("status", status);
         UpdateResult result = mongoTemplate.updateFirst(basicQuery, update, IpResource.class);
 
         if (result.getModifiedCount() < 1)

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

@@ -975,8 +975,11 @@ public class IpResourceServiceImpl implements IpResourceService {
                 }
                 break;
             case 5:
-                // 已分配
-                ipResources = ipResourceRepository.findShopIdInList(shopIds, false);
+                // 已分配且未过期
+                ipResources = ipResourceRepository.findShopIdInList(shopIds, false)
+                                                  .stream()
+                                                  .filter(x -> x.getValidTime() > Instant.now().toEpochMilli())
+                                                  .collect(Collectors.toList());
                 if (!isParent)
                     notUsed = ipResourceRepository.findByOwnerAndStatusInAndIsDeletedAndBind(username, Arrays.asList(0, 2, 4, 8), false, false);
                 else