资源组变更通知调整

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UnionEnterpriseAuthResNoticeDTO.java

@@ -42,6 +42,11 @@ public class UnionEnterpriseAuthResNoticeDTO implements Serializable{
      */
     private CustomAreaDTO customAreaDTO;
 
+    /**
+     * 1 : 初始化 2：资源组变更
+     */
+    private Integer resourceGroupChangeType;
+
     public Long getStoreResource() {
         return storeResource;
     }
@@ -96,6 +101,18 @@ public class UnionEnterpriseAuthResNoticeDTO implements Serializable{
         return this;
     }
 
+    public Integer getResourceGroupChangeType() {
+        if (resourceGroupChangeType == null) {
+            return 1;
+        }
+        return resourceGroupChangeType;
+    }
+
+    public UnionEnterpriseAuthResNoticeDTO setResourceGroupChangeType(Integer resourceGroupChangeType) {
+        this.resourceGroupChangeType = resourceGroupChangeType;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "UnionEnterpriseAuthResNoticeDTO{" +
@@ -105,6 +122,7 @@ public class UnionEnterpriseAuthResNoticeDTO implements Serializable{
                 ", goodsResourceId=" + goodsResourceId +
                 ", userResourceInfoList=" + userResourceInfoList +
                 ", customAreaDTO=" + customAreaDTO +
+                ", resourceGroupChangeType=" + resourceGroupChangeType +
                 '}';
     }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/service/ResourceGroupApiService.java

@@ -38,10 +38,11 @@ public interface ResourceGroupApiService {
      * @param unionEnterpriseId 联合商户ID
      * @param newResourceGroup
      * @param oldResourceGroup
+     * @param resourceGroupChangeType 1 : 初始化 2：资源组变更, 默认1
      * @return
      */
     ServiceResponse<Void> syncResourceAuthChangeMQ(Integer ownEnterpriseId, Integer unionEnterpriseId,
-                                                   ResourceGroupDTO newResourceGroup, ResourceGroupDTO oldResourceGroup);
+                                                   ResourceGroupDTO newResourceGroup, ResourceGroupDTO oldResourceGroup, Integer resourceGroupChangeType);
 
     /**
      * 分页查询

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

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.gic.store.service.UnionStoreChangeApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -56,6 +57,8 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
     private UnionEnterpriseAuthApiService unionEnterpriseAuthApiService;
     @Autowired
     private AuthCodeApiService authCodeApiService;
+    @Autowired
+    private UnionStoreChangeApiService unionStoreChangeApiService;
 
     @Override
     public ServiceResponse<Integer> saveResourceGroup(ResourceGroupDTO resourceGroup) {
@@ -84,9 +87,11 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
             }
             ResourceGroupDTO oldResourceGroup = EntityUtil.changeEntityNew(ResourceGroupDTO.class,
                     checkExistResourceGroup(resourceGroup.getResourceGroupId()));
+            // 保存商户下联合商户资源组授权范围变化日志
+            unionStoreChangeApiService.save(unionEnterpriseAuthDTO.getOwnEnterpriseId(), unionEnterpriseAuthDTO.getUnionEnterpriseId());
             //通知业务方数据同步联合调整
             syncResourceAuthChangeMQ(unionEnterpriseAuthDTO.getOwnEnterpriseId(), unionEnterpriseAuthDTO.getUnionEnterpriseId(),
-                    resourceGroup, oldResourceGroup);
+                    resourceGroup, oldResourceGroup, 2);
         }
 
         resourceGroupService.editResourceGroup(resourceGroup);
@@ -95,7 +100,7 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
 
     @Override
     public ServiceResponse<Void> syncResourceAuthChangeMQ(Integer ownEnterpriseId, Integer unionEnterpriseId,
-                                                          ResourceGroupDTO newResourceGroup, ResourceGroupDTO oldResourceGroup) {
+                                                          ResourceGroupDTO newResourceGroup, ResourceGroupDTO oldResourceGroup, Integer resourceGroupChangeType) {
         UnionEnterpriseAuthResNoticeDTO unionEnterpriseAuthResNoticeDTO = new UnionEnterpriseAuthResNoticeDTO();
         unionEnterpriseAuthResNoticeDTO.setGoodsResourceId(newResourceGroup.getGoodsResourceId());
         unionEnterpriseAuthResNoticeDTO.setStoreResource(newResourceGroup.getStoreResource());

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

@@ -80,4 +80,5 @@
 
     <dubbo:reference interface="com.gic.enterprise.service.QrCodeApiService" id="qrCodeApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.UnionEnterpriseAuthApiService" id="unionEnterpriseAuthApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.store.service.UnionStoreChangeApiService" id="unionStoreChangeApiService" timeout="6000" />
 </beans>