分配店铺修改

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

@@ -6,6 +6,6 @@ public interface UserShopRepositoryCustom {
 
     void updateGroupId(String groupId_old, String groupId_new);
 
-    boolean deleteByShopIdExceptOwner(String shopId);
+    boolean deleteByShopIdExceptOwner(String shopId, String owner);
 
 }

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

@@ -42,10 +42,10 @@ public class UserShopRepositoryCustomImpl implements UserShopRepositoryCustom {
     }
 
     @Override
-    public boolean deleteByShopIdExceptOwner(String shopId) {
+    public boolean deleteByShopIdExceptOwner(String shopId, String owner) {
         Document doc = new Document();
         BasicQuery basicQuery = new BasicQuery(doc);
-        basicQuery.addCriteria(where("shopId").is(shopId));
+        basicQuery.addCriteria(where("shopId").is(shopId).and("username").ne(owner));
         DeleteResult operation = mongoTemplate.remove(basicQuery, UserShop.class);
         if (operation.getDeletedCount() < 1)
             return false;

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

@@ -272,8 +272,7 @@ public class ShopServiceImpl implements ShopService {
             throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST);
         shops.stream().forEach(shop -> {
             try {
-                //todo 不删除owner
-                userShopRepository.deleteByShopIdExceptOwner(shop.getShopId());
+                userShopRepository.deleteByShopIdExceptOwner(shop.getShopId(), shop.getOwner());
                 for (Account account1 : accounts) {
                     UserShop userShop1 = userShopRepository.findByUsernameAndShopId(account1.getName(), shop.getShopId());
                     if (userShop1 != null)