联合商户，资源组授权列表标志是否已经授权

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/union/UnionEnterpriseAuthController.java

@@ -4,7 +4,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.gic.enterprise.dto.WmStoreDTO;
-import com.gic.enterprise.dto.union.OwnEnterpriseAuthListDTO;
+import com.gic.enterprise.dto.union.*;
 import com.gic.enterprise.qo.union.UnionEnterpriseAuthResLogQO;
 import com.gic.enterprise.service.WmStoreApiService;
 import com.gic.marketing.api.dto.sms.EnterpriseSmsSignDTO;
@@ -26,9 +26,6 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.download.utils.OperationResultUtils;
 import com.gic.enterprise.dto.EnterpriseDTO;
-import com.gic.enterprise.dto.union.UnionEnterpriseAuthAppDTO;
-import com.gic.enterprise.dto.union.UnionEnterpriseAuthDTO;
-import com.gic.enterprise.dto.union.UnionEnterpriseAuthResDTO;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.exception.CommonException;
 import com.gic.enterprise.response.EnterpriseRestResponse;
@@ -190,6 +187,34 @@ public class UnionEnterpriseAuthController {
     public RestResponse listResourceGroup() {
         ServiceResponse<List<ResourceGroupDTO>> response = resourceGroupApiService.listResourceGroup(null,
                 UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (response.isSuccess()) {
+            List<ResourceGroupDTO> list = response.getResult();
+            if (CollectionUtils.isNotEmpty(list)) {
+                ServiceResponse<List<UnionEnterpriseAuthDTO>> unionEnterpriseResponse = unionEnterpriseAuthApiService
+                        .listUnionEnterpriseAuth(UserDetailUtils.getUserDetail().getEnterpriseId());
+                Set<String> authResourceGroupSet = new HashSet<>();
+                if (unionEnterpriseResponse.isSuccess()) {
+                    List<UnionEnterpriseAuthDTO> unionEnterprise = unionEnterpriseResponse.getResult();
+                    if (CollectionUtils.isNotEmpty(unionEnterprise)) {
+                        authResourceGroupSet = unionEnterprise.stream()
+                                .filter(e -> e.getResourceGroupId() != null)
+                                .map(e -> e.getResourceGroupId().toString())
+                                .collect(Collectors.toSet());
+                    }
+                }
+                List<UnionResourceGroupVO> result = new ArrayList<>();
+                Set<String> finalAuthResourceGroupSet = authResourceGroupSet;
+                list.forEach(e -> {
+                    UnionResourceGroupVO vo = EntityUtil.changeEntityNew(UnionResourceGroupVO.class, e);
+                    if (finalAuthResourceGroupSet.contains(e.getResourceGroupId().toString())) {
+                        vo.setHasAuth(true);
+                    } else {
+                        vo.setHasAuth(false);
+                    }
+                    result.add(vo);
+                });
+            }
+        }
         return ResultControllerUtils.commonResult(response, UnionResourceGroupVO.class);
     }
 

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/union/UnionResourceGroupVO.java

@@ -21,6 +21,11 @@ public class UnionResourceGroupVO implements Serializable{
      */
     private String resourceGroupName;
 
+    /**
+     * 如果已经授权过，则禁止选择
+     */
+    private boolean hasAuth;
+
     public Integer getResourceGroupId() {
         return resourceGroupId;
     }
@@ -39,11 +44,21 @@ public class UnionResourceGroupVO implements Serializable{
         return this;
     }
 
+    public boolean isHasAuth() {
+        return hasAuth;
+    }
+
+    public UnionResourceGroupVO setHasAuth(boolean hasAuth) {
+        this.hasAuth = hasAuth;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "UnionResourceGroupVO{" +
                 "resourceGroupId=" + resourceGroupId +
                 ", resourceGroupName='" + resourceGroupName + '\'' +
+                ", hasAuth=" + hasAuth +
                 '}';
     }
 }