更新查询店铺接口

src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java

@@ -107,9 +107,6 @@ public class AccountServiceImpl implements AccountService {
     @Autowired
     private UserAuthService userAuthService;
 
-    @Autowired
-    private UserRepository userRepository;
-
     @Autowired
     private ShopService shopService;
 

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

@@ -232,7 +232,7 @@ public class ShopController {
     public ResultDto queryShop(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
         ResultDto resultDto = new ResultDto();
         try {
-            ShopDto shopDto = shopService.queryShop(principal.getName(), shopRequestDto.getShopId());
+            ShopResultDto shopDto = shopService.queryShop(principal.getName(), shopRequestDto.getShopId());
             resultDto.setData(shopDto);
             resultDto.setStatus(0);
         }catch (ClientRequestException e) {

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

@@ -302,7 +302,7 @@ public class ShopServiceImpl implements ShopService {
     }
 
     @Override
-    public ShopDto queryShop(String username, String shopId) {
+    public ShopResultDto queryShop(String username, String shopId) {
         Account account = accountRepository.findByName(username);
         if (account == null) {
             throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST);
@@ -318,7 +318,9 @@ public class ShopServiceImpl implements ShopService {
         IpResource ipResource = ipResourceRepository.findByShopIdAndIsDeleted(shopId, false);
         if (ipResource == null)
             throw new ClientRequestException(BrowserErrorCode.IPNOTEXIST);
-        return new ShopDto(shop);
+        String group = userShopRepository.findByUsernameAndShopId(username, shop.getShopId()).getGroupId();
+        ShopResultDto shopResultDto = ShopResultDto.of(shop, group, ipResource);
+        return shopResultDto;
     }
 
     @Override

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

@@ -22,7 +22,7 @@ public interface ShopService {
 
     void assignShops(String username, List<String> shopIds, List<String> users);
 
-    ShopDto queryShop(String username, String shopId);
+    ShopResultDto queryShop(String username, String shopId);
 
     ShopPageResultDto getShopList(String username, String groupId, int page, int amount, ShopFilterDto shopFilterDto);