资源组联合商户授权判断用户域license

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceGroupApiServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.auth.service.outer.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.gic.enterprise.service.EnterpriseLicensePatternApiService;
 import com.gic.store.service.StoreAuthorizationApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -57,6 +58,8 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
 
     @Autowired
     private StoreAuthorizationApiService storeAuthorizationApiService;
+    @Autowired
+    private EnterpriseLicensePatternApiService enterpriseLicensePatternApiService;
 
     @Override
     public ServiceResponse<Integer> saveResourceGroup(ResourceGroupDTO resourceGroup) {
@@ -71,11 +74,18 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
         //是否联合授权，如果是
         UnionEnterpriseAuthDTO unionEnterpriseAuthDTO = unionEnterpriseAuthApiService
                 .getUnionEnterpriseAuthByResourceGroupId(resourceGroup.getResourceGroupId()).getResult();
-        if (unionEnterpriseAuthDTO != null) {
+        //有效的才会重新授权。如果是已解除、待解除、解除中，不再重新授权
+        if (unionEnterpriseAuthDTO != null && unionEnterpriseAuthDTO.getStatusFlag() == 1) {
             //验证码验证
             if (!"hasValid".equals(resourceGroup.getAuthCode())) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "验证码未通过");
             }
+
+            if (!enterpriseLicensePatternApiService.validUserLicenseEnough(resourceGroup.getResourceGroupId(),
+                    unionEnterpriseAuthDTO.getUnionEnterpriseId()).getResult()) {
+                throw new CommonException(ErrorCode.PARAMETER_ERROR.getCode(), "联合商户的用户域license不足");
+            }
+
             ResourceGroupDTO oldResourceGroup = EntityUtil.changeEntityNew(ResourceGroupDTO.class,
                     checkExistResourceGroup(resourceGroup.getResourceGroupId()));
             // 保存商户下联合商户资源组授权范围变化日志

gic-platform-auth-service/src/main/resources/dubbo-gic-platform-auth-service.xml

@@ -83,4 +83,5 @@
     <dubbo:reference interface="com.gic.enterprise.service.UnionEnterpriseAuthApiService" id="unionEnterpriseAuthApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.WmStoreApiService" id="wmStoreApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.store.service.UnionStoreChangeApiService" id="unionStoreChangeApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.enterprise.service.EnterpriseLicensePatternApiService" id="enterpriseLicensePatternApiService" timeout="6000" />
 </beans>