资源授权通知调整

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

-package com.gic.enterprise.dto.union;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 联合商户资源授权通知
- * @ClassName:
- * @Description: 

- * @author guojuxing

- * @date 2021/2/24 4:50 PM

- */
-public class UnionEnterpriseAuthResNoticeDTO implements Serializable{
-    private static final long serialVersionUID = -7222957448764839407L;
-    /**
-     * 自有商户ID
-     */
-    private Integer ownEnterpriseId;
-
-    /**
-     * 联合商户ID
-     */
-    private Integer unionEnterpriseId;
-
-    /**
-     * 门店资源
-     */
-    private Long storeResource;
-
-    /**
-     * 商品资源
-     */
-    private Long goodsResourceId;
-
-    /**
-     * 用户域的域数据变更信息
-     */
-    private List<UserResourceChangeInfoDTO> userResourceInfoList;
-
-    public Long getStoreResource() {
-        return storeResource;
-    }
-
-    public UnionEnterpriseAuthResNoticeDTO setStoreResource(Long storeResource) {
-        this.storeResource = storeResource;
-        return this;
-    }
-
-    public Long getGoodsResourceId() {
-        return goodsResourceId;
-    }
-
-    public UnionEnterpriseAuthResNoticeDTO setGoodsResourceId(Long goodsResourceId) {
-        this.goodsResourceId = goodsResourceId;
-        return this;
-    }
-
-    public List<UserResourceChangeInfoDTO> getUserResourceInfoList() {
-        return userResourceInfoList;
-    }
-
-    public UnionEnterpriseAuthResNoticeDTO setUserResourceInfoList(List<UserResourceChangeInfoDTO> userResourceInfoList) {
-        this.userResourceInfoList = userResourceInfoList;
-        return this;
-    }
-
-    public Integer getOwnEnterpriseId() {
-        return ownEnterpriseId;
-    }
-
-    public UnionEnterpriseAuthResNoticeDTO setOwnEnterpriseId(Integer ownEnterpriseId) {
-        this.ownEnterpriseId = ownEnterpriseId;
-        return this;
-    }
-
-    public Integer getUnionEnterpriseId() {
-        return unionEnterpriseId;
-    }
-
-    public UnionEnterpriseAuthResNoticeDTO setUnionEnterpriseId(Integer unionEnterpriseId) {
-        this.unionEnterpriseId = unionEnterpriseId;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "UnionEnterpriseAuthResNoticeDTO{" +
-                "ownEnterpriseId=" + ownEnterpriseId +
-                ", unionEnterpriseId=" + unionEnterpriseId +
-                ", storeResource=" + storeResource +
-                ", goodsResourceId=" + goodsResourceId +
-                ", userResourceInfoList=" + userResourceInfoList +
-                '}';
-    }
-}

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/union/UserResourceChangeInfoDTO.java

-package com.gic.enterprise.dto.union;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 用户域资源域数据（小程序、服务号、会员卡等）变更情况信息
- * @ClassName:
- * @Description: 

- * @author guojuxing

- * @date 2021/2/24 4:53 PM

- */
-public class UserResourceChangeInfoDTO implements Serializable{
-    private static final long serialVersionUID = 5480272198512708835L;
-
-    /**
-     * 域数据类型 CuTypeEnum枚举
-     */
-    private Integer type;
-
-    /**
-     * 增加的域ID
-     */
-    private List<Long> addList;
-
-    /**
-     * 删除的域ID集合
-     */
-    private List<Long> deleteList;
-
-    public Integer getType() {
-        return type;
-    }
-
-    public UserResourceChangeInfoDTO setType(Integer type) {
-        this.type = type;
-        return this;
-    }
-
-    public List<Long> getAddList() {
-        return addList;
-    }
-
-    public UserResourceChangeInfoDTO setAddList(List<Long> addList) {
-        this.addList = addList;
-        return this;
-    }
-
-    public List<Long> getDeleteList() {
-        return deleteList;
-    }
-
-    public UserResourceChangeInfoDTO setDeleteList(List<Long> deleteList) {
-        this.deleteList = deleteList;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "UserResourceChangeInfoDTO{" +
-                "type=" + type +
-                ", addList=" + addList +
-                ", deleteList=" + deleteList +
-                '}';
-    }
-}

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/union/UnionEnterpriseAuthApiServiceImpl.java

 package com.gic.enterprise.service.outer.impl.union;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import org.springframework.validation.annotation.Validated;
+
 import com.gic.api.base.commons.Page;
-import com.gic.auth.dto.ResourceGroupCustomUserDTO;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.ResourceGroupDTO;
 import com.gic.auth.dto.UserDTO;
 import com.gic.auth.service.ResourceGroupApiService;
 import com.gic.auth.service.UserApiService;
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GICMQClientUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.constant.union.UnionEnterpriseAuthDetailStatusEnum;
 import com.gic.enterprise.constant.union.UnionEnterpriseAuthResOperateEnum;
@@ -17,33 +31,14 @@ import com.gic.enterprise.constant.union.UnionEnterpriseAuthStatusEnum;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.union.*;
 import com.gic.enterprise.entity.TabEnterprise;
+import com.gic.enterprise.entity.TabSysUnionEnterpriseAuth;
 import com.gic.enterprise.entity.TabSysUnionEnterpriseAuthApp;
 import com.gic.enterprise.entity.TabSysUnionEnterpriseAuthResDetail;
+import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.exception.CommonException;
 import com.gic.enterprise.qo.union.UnionEnterpriseAuthResLogQO;
 import com.gic.enterprise.service.*;
-import com.gic.mq.sdk.GicMQClient;
 import com.gic.store.service.StoreAuthorizationApiService;
-import net.sf.json.JSONArray;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-import org.springframework.validation.annotation.Validated;
-
-import com.gic.api.base.commons.ServiceResponse;
-import com.gic.enterprise.entity.TabSysUnionEnterpriseAuth;
-import com.gic.enterprise.error.ErrorCode;
-import com.gic.enterprise.exception.CommonException;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
 
 
 /**
@@ -116,8 +111,12 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
         //
         checkResourceDealing((old.getUnionEnterpriseAuthId()));
 
-        //授权通知
+        //授权通知(用户域)
         resourceGroupApiService.syncResourceAuthChangeMQ(dto.getOwnEnterpriseId(), dto.getUnionEnterpriseId(), resourceGroupDTO, oldResourceGroupDTO);
+        //门店通知
+        if (resourceGroupDTO.getStoreResource() != null) {
+            storeAuthorizationApiService.authStore(resourceGroupDTO.getStoreResource().intValue(), dto.getUnionEnterpriseId(), dto.getOwnEnterpriseId());
+        }
 
         unionEnterpriseAuthService.update(data);
         //初始化未授权资源数据