shopusers

src/main/java/com/edgec/browserbackend/browser/controller/ShopController.java

@@ -196,4 +196,21 @@ public class ShopController {
         }
         return resultDto;
     }
+
+    @RequestMapping(value = "/subusers", method = RequestMethod.POST)
+    public ResultDto getShopSubUsers(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
+        ResultDto resultDto = new ResultDto();
+        try {
+            List<String> subUsers = shopService.getShopUsers(principal.getName(), shopRequestDto.getShopId());
+            resultDto.setData(subUsers);
+            resultDto.setStatus(0);
+        }catch (ClientRequestException e) {
+            resultDto.setStatus(-1);
+            Map<String, Object> statusInfo = new HashMap<>();
+            statusInfo.put("code", e.getErrorCode());
+            statusInfo.put("message", e.getMessage());
+            resultDto.setStatusInfo(statusInfo);
+        }
+        return resultDto;
+    }
 }

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

@@ -262,6 +262,10 @@ public class ShopServiceImpl implements ShopService {
         List<Account> accounts = accountRepository.findByNameIn(users);
         if (accounts == null || accounts.size() != users.size())
             throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST);
+        for (Account ac : accounts) {
+            if (ac.getParent() == null)
+                throw new ClientRequestException(AccountErrorCode.NOPERMISSION);
+        }
         shops.stream().forEach(shop -> {
             try {
                 userShopRepository.deleteByShopIdExceptOwner(shop.getShopId(), shop.getOwner());
@@ -269,6 +273,8 @@ public class ShopServiceImpl implements ShopService {
                     UserShop userShop1 = userShopRepository.findByUsernameAndShopId(account1.getName(), shop.getShopId());
                     if (userShop1 != null)
                         return;
+                    userShop1 = new UserShop(account1.getName(), shop.getShopId(), "-1");
+                    userShopRepository.save(userShop1);
                 }
             } catch (Exception e) {
                 logger.error("fail to assign", e.getMessage());
@@ -393,4 +399,15 @@ public class ShopServiceImpl implements ShopService {
         shopSummary.setTotal(userShopRepository.countByUsername(username));
         return shopSummary;
     }
+
+    @Override
+    public List<String> getShopUsers(String username, String shopId) {
+        Account account = accountRepository.findByName(username);
+        if (account == null)
+            throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST);
+        if (account.getParent() != null)
+            throw new ClientRequestException(AccountErrorCode.NOPERMISSION);
+        List<String> shopUsers = userShopRepository.findByShopId(shopId).stream().map(x -> x.getUsername()).filter(x -> x!=username).collect(Collectors.toList());
+        return shopUsers;
+    }
 }

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

@@ -28,4 +28,6 @@ public interface ShopService {
     ShopPageResultDto getShopList(String username, String groupId, int page, int amount, ShopFilterDto shopFilterDto);
 
     ShopSummary getShopSummary(String username);
+
+    List<String> getShopUsers(String username, String shopId);
 }