session调整

gic-enterprise-base-api/src/main/java/com/gic/enterprise/base/CustomUserInfo.java

+package com.gic.enterprise.base;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 资源组-用户域配置信息
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/11 5:03 PM

+ */
+public class CustomUserInfo implements Serializable{
+    private static final long serialVersionUID = 1367841846948855705L;
+
+    /**
+     * 1：全部   2：部分 超管就是1全部
+     */
+    private Integer type;
+
+    /**
+     * 用户域 0:不授予 1:授予
+     */
+    private Integer customUser;
+
+    /**
+     * 用户域配置json转为类
+     */
+    private List<ResourceGroupCustomUserInfo> customUserList;
+
+    /**
+     * 线下门店订单 1:用户在授权管辖门店范围内的订单 2:用户下所有订单
+     */
+    private Integer storeOrderArea;
+
+    /**
+     * 微盟商城订单 1:用户在授权店铺范围内的订单 2:不授予
+     */
+    private Integer weimobOrderArea;
+
+    /**
+     * 微盟店铺多选，weimob_order_area选择1时选择店铺
+     */
+    private List<Long> weimobStoreId;
+
+    /**
+     * 短信签名
+     */
+    private List<Long> smsId;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public CustomUserInfo setType(Integer type) {
+        this.type = type;
+        return this;
+    }
+
+    public Integer getCustomUser() {
+        return customUser;
+    }
+
+    public CustomUserInfo setCustomUser(Integer customUser) {
+        this.customUser = customUser;
+        return this;
+    }
+
+    public List<ResourceGroupCustomUserInfo> getCustomUserList() {
+        return customUserList;
+    }
+
+    public CustomUserInfo setCustomUserList(List<ResourceGroupCustomUserInfo> customUserList) {
+        this.customUserList = customUserList;
+        return this;
+    }
+
+    public Integer getStoreOrderArea() {
+        return storeOrderArea;
+    }
+
+    public CustomUserInfo setStoreOrderArea(Integer storeOrderArea) {
+        this.storeOrderArea = storeOrderArea;
+        return this;
+    }
+
+    public Integer getWeimobOrderArea() {
+        return weimobOrderArea;
+    }
+
+    public CustomUserInfo setWeimobOrderArea(Integer weimobOrderArea) {
+        this.weimobOrderArea = weimobOrderArea;
+        return this;
+    }
+
+    public List<Long> getWeimobStoreId() {
+        return weimobStoreId;
+    }
+
+    public CustomUserInfo setWeimobStoreId(List<Long> weimobStoreId) {
+        this.weimobStoreId = weimobStoreId;
+        return this;
+    }
+
+    public List<Long> getSmsId() {
+        return smsId;
+    }
+
+    public CustomUserInfo setSmsId(List<Long> smsId) {
+        this.smsId = smsId;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "CustomUserInfo{" +
+                "type=" + type +
+                ", customUser=" + customUser +
+                ", customUserList=" + customUserList +
+                ", storeOrderArea=" + storeOrderArea +
+                ", weimobOrderArea=" + weimobOrderArea +
+                ", weimobStoreId=" + weimobStoreId +
+                ", smsId=" + smsId +
+                '}';
+    }
+}

gic-enterprise-base-api/src/main/java/com/gic/enterprise/base/GoodsResourceInfo.java

+package com.gic.enterprise.base;
+
+import java.io.Serializable;
+/**
+ * 资源组-商品资源
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/12 1:58 PM

+ */
+public class GoodsResourceInfo implements Serializable{
+    private static final long serialVersionUID = -2350990120486633216L;
+
+    /**
+     * 商品资源选择器ID
+     */
+    private Long goodsResourceId;
+
+    /**
+     * 1：全部 (超管)  2：部分
+     */
+    private Integer type;
+
+    public Long getGoodsResourceId() {
+        return goodsResourceId;
+    }
+
+    public GoodsResourceInfo setGoodsResourceId(Long goodsResourceId) {
+        this.goodsResourceId = goodsResourceId;
+        return this;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public GoodsResourceInfo setType(Integer type) {
+        this.type = type;
+        return this;
+    }
+}

gic-enterprise-base-api/src/main/java/com/gic/enterprise/base/ResourceGroupCustomUserInfo.java

+package com.gic.enterprise.base;
+
+import java.io.Serializable;
+/**
+ * 用户域多组配置
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/11 5:05 PM

+ */
+public class ResourceGroupCustomUserInfo implements Serializable{
+    private static final long serialVersionUID = -6022309920151839631L;
+
+    /**
+     * 1：会员卡域 2：服务号域 3：小程序域
+     */
+    private Integer type;
+
+    /**
+     * 显示顺序(用于前端)
+     */
+    private Integer sort;
+
+    /**
+     * 域ID，多选，英文逗号隔开
+     */
+    private String areaValue;
+
+    /**
+     * 人群筛选器ID
+     */
+    private Long cuSelectId;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public ResourceGroupCustomUserInfo setType(Integer type) {
+        this.type = type;
+        return this;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public ResourceGroupCustomUserInfo setSort(Integer sort) {
+        this.sort = sort;
+        return this;
+    }
+
+    public String getAreaValue() {
+        return areaValue;
+    }
+
+    public ResourceGroupCustomUserInfo setAreaValue(String areaValue) {
+        this.areaValue = areaValue;
+        return this;
+    }
+
+    public Long getCuSelectId() {
+        return cuSelectId;
+    }
+
+    public ResourceGroupCustomUserInfo setCuSelectId(Long cuSelectId) {
+        this.cuSelectId = cuSelectId;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "ResourceGroupCustomUserInfo{" +
+                "type=" + type +
+                ", sort=" + sort +
+                ", areaValue='" + areaValue + '\'' +
+                ", cuSelectId=" + cuSelectId +
+                '}';
+    }
+}

gic-enterprise-base-api/src/main/java/com/gic/enterprise/base/StoreResourceInfo.java

+package com.gic.enterprise.base;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 资源组-门店资源
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/11 5:07 PM

+ */
+public class StoreResourceInfo implements Serializable{
+    private static final long serialVersionUID = 3819900076006580887L;
+
+    private List<Integer> storeIdList;
+    /**
+     * 1：全部   2：部分
+     */
+    private Integer type;
+
+    public List<Integer> getStoreIdList() {
+        return storeIdList;
+    }
+
+    public StoreResourceInfo setStoreIdList(List<Integer> storeIdList) {
+        this.storeIdList = storeIdList;
+        return this;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public StoreResourceInfo setType(Integer type) {
+        this.type = type;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "StoreResourceInfo{" +
+                "storeIdList=" + storeIdList +
+                ", type=" + type +
+                '}';
+    }
+}

gic-enterprise-base-api/src/main/java/com/gic/enterprise/utils/UserDetail.java

 package com.gic.enterprise.utils;
 
-import com.gic.enterprise.base.EnterpriseInfo;
-import com.gic.enterprise.base.MenuInfo;
-import com.gic.enterprise.base.UserInfo;
-import com.gic.enterprise.base.UserResourceInfo;
+import com.gic.enterprise.base.*;
 
 import java.io.Serializable;
 import java.util.List;
@@ -27,6 +24,21 @@ public class UserDetail implements Serializable {
      */
     private Set<Integer> menuIdSet;
 
+    /**
+     * 资源组-用户域的配置信息
+     */
+    private CustomUserInfo customUserInfo;
+
+    /**
+     * 资源组-商品资源
+     */
+    private GoodsResourceInfo goodsResourceInfo;
+
+    /**
+     * 资源组-门店资源
+     */
+    private StoreResourceInfo storeResourceInfo;
+
     public Integer getUserId() {
         return userId;
     }
@@ -71,4 +83,31 @@ public class UserDetail implements Serializable {
         this.menuIdSet = menuIdSet;
         return this;
     }
+
+    public CustomUserInfo getCustomUserInfo() {
+        return customUserInfo;
+    }
+
+    public UserDetail setCustomUserInfo(CustomUserInfo customUserInfo) {
+        this.customUserInfo = customUserInfo;
+        return this;
+    }
+
+    public GoodsResourceInfo getGoodsResourceInfo() {
+        return goodsResourceInfo;
+    }
+
+    public UserDetail setGoodsResourceInfo(GoodsResourceInfo goodsResourceInfo) {
+        this.goodsResourceInfo = goodsResourceInfo;
+        return this;
+    }
+
+    public StoreResourceInfo getStoreResourceInfo() {
+        return storeResourceInfo;
+    }
+
+    public UserDetail setStoreResourceInfo(StoreResourceInfo storeResourceInfo) {
+        this.storeResourceInfo = storeResourceInfo;
+        return this;
+    }
 }