Merge remote-tracking branch 'origin/master'

src/main/java/com/edgec/browserbackend/account/controller/AdministratorController.java

@@ -10,6 +10,7 @@ import com.edgec.browserbackend.account.service.*;
 import com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode;
 import com.edgec.browserbackend.browser.domain.PayBack;
 import com.edgec.browserbackend.browser.dto.IpListRequestDto;
+import com.edgec.browserbackend.browser.service.ShopService;
 import com.edgec.browserbackend.browser.service.TempService;
 import com.edgec.browserbackend.common.auth.Securitys;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
@@ -71,6 +72,9 @@ public class AdministratorController {
     @Autowired
     private PayBackService payBackService;
 
+    @Autowired
+    private ShopService shopService;
+
     //--------------------------------ROOT用户操作--------------------------------------//
     //管理员注册tested
     @PreAuthorize(Securitys.ROOT_EL)
@@ -688,6 +692,15 @@ public class AdministratorController {
         administratorService.delNotice();
         return true;
     }
+
+    /**
+     * 删除shopua
+     */
+    @PreAuthorize(Securitys.ADMIN_EL)
+    @RequestMapping(path = "/0xadministrator/delShopUa/{uaflag}", method = RequestMethod.DELETE)
+    public boolean delShopUa(@PathVariable String uaflag) {
+        return shopService.delShopUa(uaflag);
+    }
 }
 
 

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

@@ -961,6 +961,8 @@ public class IpResourceServiceImpl implements IpResourceService {
                     notUsed = ipResourceRepository.findByOwnerAndIsDeletedAndBind(username, false, false);
                 } else {
                     notUsed = ipResourceRepository.findByOwnerInAndIsDeletedAndBind(accountNameList, false, false);
+                    // 子账户店铺已绑定的IP也要查询出来
+                    ipResources.addAll(ipResourceRepository.findByOwnerInAndIsDeletedAndBind(accountNameList, false, true));
                 }
                 break;
             case 2:
@@ -969,6 +971,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                     notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndBind(username, 2, false, false);
                 } else {
                     notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 2, false, false);
+                    ipResources.addAll(ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 2, false, true));
                 }
                 break;
             case 3:
@@ -977,6 +980,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                     notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndBind(username, 1, false, false);
                 } else {
                     notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 1, false, false);
+                    ipResources.addAll(ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 1, false, true));
                 }
                 break;
             case 4:
@@ -992,10 +996,12 @@ public class IpResourceServiceImpl implements IpResourceService {
                                                   .stream()
                                                   .filter(x -> x.getValidTime() > Instant.now().toEpochMilli())
                                                   .collect(Collectors.toList());
-                if (!isParent)
+                if (!isParent) {
                     notUsed = ipResourceRepository.findByOwnerAndStatusInAndIsDeletedAndBind(username, Arrays.asList(0, 2, 4, 8), false, false);
-                else
+                } else {
                     notUsed = ipResourceRepository.findByOwnerInAndStatusInAndIsDeletedAndBind(accountNameList, Arrays.asList(0, 2, 4, 8), false, false);
+                    ipResources.addAll(ipResourceRepository.findByOwnerInAndStatusInAndIsDeletedAndBind(accountNameList, Arrays.asList(0, 2, 4, 8), false, true));
+                }
                 break;
         }
         if (CollectionUtils.isNotEmpty(ipResources))

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

@@ -806,6 +806,18 @@ public class ShopServiceImpl implements ShopService {
         return shop.getFavoritesUrls();
     }
 
+    @Override
+    public boolean delShopUa(String uaflag) {
+        List<ShopUA> all = shopUaRepository.findAll();
+        for(ShopUA shopUa : all){
+            List<String> uaList = shopUa.getUaList();
+            List<String> newUaList = uaList.stream().filter((p) -> !p.contains(uaflag)).collect(Collectors.toList());
+            shopUa.setUaList(newUaList);
+            shopUaRepository.save(shopUa);
+        }
+        return true;
+    }
+
     @Override
     public boolean saveFavoritesByShopId(String shopId, FavoriteUrl favoriteUrl) {
         return shopRepository.saveFavoritesUrls(shopId, favoriteUrl);

src/main/java/com/edgec/browserbackend/browser/service/ShopService.java

@@ -65,4 +65,6 @@ public interface ShopService {
     boolean deleteFavoritesByShopId(String shopId, FavoriteUrl favoriteUrl);
 
     List<FavoriteUrl> getFavoritesByShopId(String shopId);
+
+    boolean delShopUa(String flag);
 }