shop接口修改

src/main/java/com/edgec/browserbackend/browser/dto/ShopDto.java

@@ -34,7 +34,7 @@ public class ShopDto {
 
     private IpResource bindIp;
 
-    public static ShopDto of(Shop shop, IpResource ipResources) {
+    public static ShopDto of(Shop shop, String group, IpResource ipResources) {
         ShopDto shopDto = new ShopDto();
         shopDto.setShopId(shop.getShopId());
         if (shop.getShopName() != null)
@@ -53,6 +53,9 @@ public class ShopDto {
             shopDto.setShopUA(shop.getShopUA());
         if (shop.getShopCookie() != null)
             shopDto.setShopCookie(shop.getShopCookie());
+        if (shop.getShopAccount() != null)
+            shopDto.setShopAccount(shop.getShopAccount());
+        shopDto.setGroup(group);
         shopDto.setBindIp(ipResources);
         return shopDto;
     }

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

@@ -309,7 +309,8 @@ public class ShopServiceImpl implements ShopService {
             IpResource ipResource = ipResourceRepository.findByAddrAndIsDeleted(x.getIp(), false);
             if (ipResource == null)
                 ipResource = new IpResource();
-            shopDtos.add(ShopDto.of(x, ipResource));
+            String group1 = userShopRepository.findByUsernameAndShopId(username, x.getShopId()).getGroupId();
+            shopDtos.add(ShopDto.of(x, group1, ipResource));
         });
         Page<ShopDto> shopDtoPage = new PageImpl<>(shopDtos, pageable, shopDtos.size());
         ShopPageResultDto shopPageResultDto = new ShopPageResultDto();