Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 授权资源类别：会员卡渠道
+ * @ClassName: ChannelAuthDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/3/2 3:13 PM

+ */
+public class ChannelAuthDTO implements Serializable{
+    private static final long serialVersionUID = 8907085677012908128L;
+
+    private List<ChannelDTO> channelList;
+
+    public ChannelAuthDTO() {
+
+    }
+
+    public ChannelAuthDTO(List<ChannelDTO> channelList) {
+        this.channelList = channelList;
+    }
+
+
+    public List<ChannelDTO> getChannelList() {
+        return channelList;
+    }
+
+    public void setChannelList(List<ChannelDTO> channelList) {
+        this.channelList = channelList;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+
+public class ChannelDTO implements Serializable{
+    private static final long serialVersionUID = 7594299146166653493L;
+
+    private Long channelId;
+
+    private String channelName;
+
+    /**
+     * 1：会员卡 2：服务号 3：小程序
+     */
+    private Integer type;
+
+    public ChannelDTO() {
+
+    }
+
+    public ChannelDTO(Long channelId, String channelName, Integer type) {
+        this.channelId = channelId;
+        this.channelName = channelName;
+        this.type = type;
+    }
+
+    public Long getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Long channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+
+public class ChannelResourceDTO implements Serializable{
+    private static final long serialVersionUID = 8158792714988882673L;
+    /**
+     * 渠道资源ID
+     */
+    private Integer channelResource;
+
+    private ChannelAuthDTO channelAuth;
+
+    public ChannelAuthDTO getChannelAuth() {
+        return channelAuth;
+    }
+
+    public void setChannelAuth(ChannelAuthDTO channelAuth) {
+        this.channelAuth = channelAuth;
+    }
+
+    public Integer getChannelResource() {
+        return channelResource;
+    }
+
+    public void setChannelResource(Integer channelResource) {
+        this.channelResource = channelResource;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+
+public class GoodsResourceDTO implements Serializable{
+    private static final long serialVersionUID = 368101547153742819L;
+    /**
+     * 商品选择器ID
+     */
+    private Long goodsResource;
+
+    private GoodsRightsAuthDTO goodsRightsAuth;
+
+    public Long getGoodsResource() {
+        return goodsResource;
+    }
+
+    public void setGoodsResource(Long goodsResource) {
+        this.goodsResource = goodsResource;
+    }
+
+    public GoodsRightsAuthDTO getGoodsRightsAuth() {
+        return goodsRightsAuth;
+    }
+
+    public void setGoodsRightsAuth(GoodsRightsAuthDTO goodsRightsAuth) {
+        this.goodsRightsAuth = goodsRightsAuth;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class GoodsRightsAuthDTO implements Serializable{
+    private static final long serialVersionUID = 3365902031841545564L;
+
+    private List<GoodsRightsChannelDTO> goodsRightsChannelList;
+
+    public List<GoodsRightsChannelDTO> getGoodsRightsChannelList() {
+        return goodsRightsChannelList;
+    }
+
+    public void setGoodsRightsChannelList(List<GoodsRightsChannelDTO> goodsRightsChannelList) {
+        this.goodsRightsChannelList = goodsRightsChannelList;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+
+public class GoodsRightsBrandDTO implements Serializable{
+    private static final long serialVersionUID = 2236740261653028520L;
+
+    private Long brandId;
+
+    private String brandCode;
+
+    private String brandName;
+
+    public Long getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(Long brandId) {
+        this.brandId = brandId;
+    }
+
+    public String getBrandCode() {
+        return brandCode;
+    }
+
+    public void setBrandCode(String brandCode) {
+        this.brandCode = brandCode;
+    }
+
+    public String getBrandName() {
+        return brandName;
+    }
+
+    public void setBrandName(String brandName) {
+        this.brandName = brandName;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class GoodsRightsChannelDTO implements Serializable{
+    private static final long serialVersionUID = -1343276116860387848L;
+
+    private String channelCode;
+
+    private String channelName;
+
+    private List<GoodsRightsDomainDTO> goodsRightsDomainList;
+
+    public String getChannelCode() {
+        return channelCode;
+    }
+
+    public void setChannelCode(String channelCode) {
+        this.channelCode = channelCode;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public List<GoodsRightsDomainDTO> getGoodsRightsDomainList() {
+        return goodsRightsDomainList;
+    }
+
+    public void setGoodsRightsDomainList(List<GoodsRightsDomainDTO> goodsRightsDomainList) {
+        this.goodsRightsDomainList = goodsRightsDomainList;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class GoodsRightsDomainDTO implements Serializable{
+    private static final long serialVersionUID = 6324205784953715323L;
+
+    private Long goodsDomainId;
+
+    private String goodsDomainCode;
+
+    private String goodsDomainName;
+
+    private List<GoodsRightsBrandDTO> goodsRightsBrandList;
+
+    public Long getGoodsDomainId() {
+        return goodsDomainId;
+    }
+
+    public void setGoodsDomainId(Long goodsDomainId) {
+        this.goodsDomainId = goodsDomainId;
+    }
+
+    public String getGoodsDomainCode() {
+        return goodsDomainCode;
+    }
+
+    public void setGoodsDomainCode(String goodsDomainCode) {
+        this.goodsDomainCode = goodsDomainCode;
+    }
+
+    public String getGoodsDomainName() {
+        return goodsDomainName;
+    }
+
+    public void setGoodsDomainName(String goodsDomainName) {
+        this.goodsDomainName = goodsDomainName;
+    }
+
+    public List<GoodsRightsBrandDTO> getGoodsRightsBrandList() {
+        return goodsRightsBrandList;
+    }
+
+    public void setGoodsRightsBrandList(List<GoodsRightsBrandDTO> goodsRightsBrandList) {
+        this.goodsRightsBrandList = goodsRightsBrandList;
+    }
+
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+
+public class OrderResourceDTO implements Serializable{
+    private static final long serialVersionUID = 2909345365948325303L;
+
+    private Integer orderResource;
+
+    private OrderStoreAuthDTO orderStoreAuth;
+
+
+    public Integer getOrderResource() {
+        return orderResource;
+    }
+
+    public void setOrderResource(Integer orderResource) {
+        this.orderResource = orderResource;
+    }
+
+    public OrderStoreAuthDTO getOrderStoreAuth() {
+        return orderStoreAuth;
+    }
+
+    public void setOrderStoreAuth(OrderStoreAuthDTO orderStoreAuth) {
+        this.orderStoreAuth = orderStoreAuth;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 授权资源类别：线下门店、达摩微商城、微盟微商城
+ * @ClassName: OrderStoreAuthDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/3/2 5:04 PM

+ */
+public class OrderStoreAuthDTO implements Serializable{
+    private static final long serialVersionUID = 5562657062750885045L;
+
+    private List<OrderStoreDTO> orderStoreList;
+
+    public OrderStoreAuthDTO() {
+
+    }
+
+    public OrderStoreAuthDTO(List<OrderStoreDTO> orderStoreList) {
+        this.orderStoreList = orderStoreList;
+    }
+
+    public List<OrderStoreDTO> getOrderStoreList() {
+        return orderStoreList;
+    }
+
+    public void setOrderStoreList(List<OrderStoreDTO> orderStoreList) {
+        this.orderStoreList = orderStoreList;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+
+public class OrderStoreDTO implements Serializable{
+    private static final long serialVersionUID = 3841064488953962444L;
+
+    private Integer storeId;
+
+    private String storeName;
+    /**
+     * 1：线下们带你订单 2：达摩微商城订单 3：微盟微商城订单
+     */
+    private Integer type;
+
+    public OrderStoreDTO() {
+
+    }
+
+    public OrderStoreDTO(Integer storeId, String storeName, Integer type) {
+        this.storeId = storeId;
+        this.storeName = storeName;
+        this.type = type;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+
+/**
+ * 对第三方开发者资源授权清单
+ * @ClassName: ResourceOpenDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/3/2 9:31 AM

+ */
+public class ResourceOpenDTO implements Serializable{
+    private static final long serialVersionUID = 4553619781718084109L;
+
+    /**
+     * 门店资源
+     */
+    private StoreResourceDTO store;
+    /**
+     * 用户资源
+     */
+    private UserResourceDTO userResource;
+    /**
+     * 渠道资源
+     */
+    private ChannelResourceDTO channelResource;
+    /**
+     * 订单资源
+     */
+    private OrderResourceDTO orderResource;
+    /**
+     * 商品资源
+     */
+    private GoodsResourceDTO goodsResource;
+
+
+    public StoreResourceDTO getStore() {
+        return store;
+    }
+
+    public void setStore(StoreResourceDTO store) {
+        this.store = store;
+    }
+
+    public UserResourceDTO getUserResource() {
+        return userResource;
+    }
+
+    public void setUserResource(UserResourceDTO userResource) {
+        this.userResource = userResource;
+    }
+
+    public ChannelResourceDTO getChannelResource() {
+        return channelResource;
+    }
+
+    public void setChannelResource(ChannelResourceDTO channelResource) {
+        this.channelResource = channelResource;
+    }
+
+    public OrderResourceDTO getOrderResource() {
+        return orderResource;
+    }
+
+    public void setOrderResource(OrderResourceDTO orderResource) {
+        this.orderResource = orderResource;
+    }
+
+    public GoodsResourceDTO getGoodsResource() {
+        return goodsResource;
+    }
+
+    public void setGoodsResource(GoodsResourceDTO goodsResource) {
+        this.goodsResource = goodsResource;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 授权资源类别：门店
+ * @ClassName: StoreAuthDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/3/2 11:24 AM

+ */
+public class StoreAuthDTO implements Serializable{
+    private static final long serialVersionUID = -8177948655496831983L;
+
+    /**
+     * 门店
+     */
+    private List<StoreOpenDTO> storeList;
+
+    public StoreAuthDTO() {
+
+    }
+
+    public StoreAuthDTO(List<StoreOpenDTO> storeList) {
+        this.storeList = storeList;
+    }
+
+    public List<StoreOpenDTO> getStoreList() {
+        return storeList;
+    }
+
+    public void setStoreList(List<StoreOpenDTO> storeList) {
+        this.storeList = storeList;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+/**
+ * 对第三方门店资源
+ * @ClassName: StoreOpenDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/3/2 9:32 AM

+ */
+public class StoreOpenDTO implements Serializable{
+    private static final long serialVersionUID = -569638793954963525L;
+
+    /**
+     * 域id
+     */
+    private Integer regionId;
+
+    /**
+     * 域名称
+     */
+    private String regionName;
+
+    public StoreOpenDTO() {
+
+    }
+
+    public StoreOpenDTO(Integer regionId, String regionName) {
+        this.regionId = regionId;
+        this.regionName = regionName;
+    }
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+/**
+ * 门店资源
+ * @ClassName: StoreResourceDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/3/2 11:26 AM

+ */
+public class StoreResourceDTO implements Serializable{
+    private static final long serialVersionUID = 3267294735384511434L;
+
+
+    /**
+     * 门店选择器ID
+     */
+    private Long storeResource;
+
+    /**
+     * 授权资源类别：门店
+     */
+    private StoreAuthDTO storeAuth;
+
+    public StoreResourceDTO() {
+
+    }
+
+    public StoreResourceDTO(Long storeResource, StoreAuthDTO storeAuth) {
+        this.storeResource = storeResource;
+        this.storeAuth = storeAuth;
+    }
+
+    public StoreAuthDTO getStoreAuth() {
+        return storeAuth;
+    }
+
+    public void setStoreAuth(StoreAuthDTO storeAuth) {
+        this.storeAuth = storeAuth;
+    }
+
+    public Long getStoreResource() {
+        return storeResource;
+    }
+
+    public void setStoreResource(Long storeResource) {
+        this.storeResource = storeResource;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 授权资源类别-会员卡、服务号、小程序
+ * @ClassName: UserAreaAuthDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/3/2 4:44 PM

+ */
+public class UserAreaAuthDTO implements Serializable{
+    private static final long serialVersionUID = -8168003661081913787L;
+
+    private List<UserAreaDTO> userAreaList;
+
+    public UserAreaAuthDTO() {
+
+    }
+
+    public UserAreaAuthDTO(List<UserAreaDTO> userAreaList) {
+        this.userAreaList = userAreaList;
+    }
+
+    public List<UserAreaDTO> getUserAreaList() {
+        return userAreaList;
+    }
+
+    public void setUserAreaList(List<UserAreaDTO> userAreaList) {
+        this.userAreaList = userAreaList;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+
+public class UserAreaDTO implements Serializable{
+    private static final long serialVersionUID = 4186646894283704858L;
+
+    private Long id;
+
+    private String name;
+    /**
+     * 1：小程序 2：服务号 3：会员卡
+     */
+    private Integer type;
+
+    public UserAreaDTO() {
+
+    }
+
+    public UserAreaDTO(Long id, String name, Integer type) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

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

+package com.gic.auth.dto.open;
+
+import java.io.Serializable;
+/**
+ * 用户资源
+ * @ClassName: UserResourceDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/3/2 1:33 PM

+ */
+public class UserResourceDTO implements Serializable{
+    private static final long serialVersionUID = 2695073226687226064L;
+    /**
+     * 人权筛选器ID
+     */
+    private Long userResource;
+
+    private UserAreaAuthDTO UserArea;
+
+
+    public Long getUserResource() {
+        return userResource;
+    }
+
+    public void setUserResource(Long userResource) {
+        this.userResource = userResource;
+    }
+
+    public UserAreaAuthDTO getUserArea() {
+        return UserArea;
+    }
+
+    public void setUserArea(UserAreaAuthDTO userArea) {
+        UserArea = userArea;
+    }
+}

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

+package com.gic.auth.service;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.dto.open.ResourceOpenDTO;
+
+public interface ResourceOpenApiService {
+
+    /**
+     * 对第三方开发者资源数据
+     * @Title: getResource

+     * @Description:
+    
* @author guojuxing
+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.open.ResourceOpenDTO>

+    
*/
+    ServiceResponse<ResourceOpenDTO> getResource(String appId, Integer enterpriseId);
+}

gic-platform-auth-service/pom.xml

@@ -147,6 +147,21 @@
             <artifactId>gic-member-config-api</artifactId>
             <version>${gic-member-config-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gateway-client-sdk</artifactId>
+            <version>${gateway-client-sdk}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-member-filter-api</artifactId>
+            <version>${gic-member-filter-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-goods-api</artifactId>
+            <version>${gic-goods-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -50,6 +50,7 @@
     <dubbo:service interface="com.gic.auth.service.CollaboratorApiService" ref="collaboratorApiService" timeout="6000" />
     <!--运营个管理员-->
     <dubbo:service interface="com.gic.auth.service.OperationUserApiService" ref="operationUserApiService" timeout="6000" />
+    <dubbo:service interface="com.gic.auth.service.ResourceOpenApiService" ref="resourceOpenApiService" timeout="6000" />
     <!--角色-->
 
     <dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000"/>
@@ -65,4 +66,9 @@
 
     <!--门店选择器-->
     <dubbo:reference interface="com.gic.store.service.StoreWidgetApiService" id="storeWidgetApiService" timeout="6000" />
+
+    <dubbo:reference interface="com.gic.member.filter.api.service.CuIndexOperaApiService" id="cuIndexOperaApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.member.config.api.service.AuthorizationEnterConfApiService" id="authorizationEnterConfApiService" timeout="6000" />
+
+    <dubbo:reference interface="com.gic.goods.api.service.GoodsRightsSelectorApiService" id="goodsRightsSelectorApiService" timeout="6000" />
 </beans>