Commit d1efc2d5 by guojuxing

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

parent 550dda30
package com.gic.enterprise.service;
import com.gic.api.base.commons.ServiceResponse;
/**
* license查询接口
* @ClassName:
* @Description: 

* @author guojuxing

* @date 2021/6/22 11:00 AM

*/
public interface EnterpriseLicensePatternApiService {
/**
* 授权资源组是否用户域license足够
* @param resourceGroupId
* @param unionEnterpriseId
* @return
*/
ServiceResponse<Boolean> validUserLicenseEnough(Integer resourceGroupId, Integer unionEnterpriseId);
}
......@@ -99,6 +99,8 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
private SmsSendApiService smsSendApiService;
@Autowired
private UserGroupPermissionApiService userGroupPermissionApiService;
@Autowired
private EnterpriseLicensePatternApiService enterpriseLicensePatternApiService;
/**
* 待解除中短信模板
......@@ -128,7 +130,6 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
@Transactional(rollbackFor = Exception.class)
public ServiceResponse<Void> authResource(@Validated UnionEnterpriseAuthResDTO dto) {
TabSysUnionEnterpriseAuth old = checkExistUnionEnterprise(dto.getOwnEnterpriseId(), dto.getUnionEnterpriseId());
//授权数据
UnionEnterpriseAuthDTO data = EntityUtil.changeEntityNew(UnionEnterpriseAuthDTO.class, dto);
data.setUnionEnterpriseAuthId(old.getUnionEnterpriseAuthId());
......@@ -140,9 +141,14 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
throw new CommonException(ErrorCode.PARAMETER_ERROR.getCode(), "资源组不能授权给不同商户");
}
}
Integer resourceGroupId = dto.getResourceGroupId();
if (!enterpriseLicensePatternApiService.validUserLicenseEnough(resourceGroupId, dto.getUnionEnterpriseId()).getResult()) {
throw new CommonException(ErrorCode.PARAMETER_ERROR.getCode(), "联合商户的用户域license不足");
}
//是否是编辑。编辑和新增授权同步资源处理不同
boolean isEdit = old.getResourceGroupId() != null && !old.getResourceGroupId().equals(dto.getResourceGroupId());
Integer resourceGroupId = dto.getResourceGroupId();
ResourceGroupDTO resourceGroupDTO = getResourceGroup(resourceGroupId);
ResourceGroupDTO oldResourceGroupDTO = null;
//1 : 初始化 2:资源组变更
......
......@@ -139,6 +139,7 @@
<dubbo:service interface="com.gic.enterprise.service.CustomSettingApiService" ref="customSettingApiService" timeout="6000" />
<dubbo:service interface="com.gic.enterprise.service.HiveDataDownloadApiService" ref="hiveDataDownloadApiService" timeout="6000" />
<dubbo:service interface="com.gic.enterprise.service.CustomGuideTopApiService" ref="customGuideTopApiService" timeout="6000" />
<dubbo:service interface="com.gic.enterprise.service.EnterpriseLicensePatternApiService" ref="enterpriseLicensePatternApiService" timeout="6000" />
<dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="6000" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment