Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-model/coolstore-partner-model.iml

@@ -71,7 +71,6 @@
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" />
-    <orderEntry type="library" name="Maven: com.coolstore:coolstore-base:1.5.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:2.0.4" level="project" />
     <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.4" level="project" />

coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthRegionStoreDTO.java

@@ -0,0 +1,18 @@
+package com.cool.store.dto.auth;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * describe:
+ *
+ * @author zhouyiping
+ * @date 2020/12/09
+ */
+@Data
+public class AuthRegionStoreDTO {
+    String userId;
+    private List<AuthRegionStoreUserDTO> authRegionStoreUserList;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthRegionStoreUserDTO.java

@@ -0,0 +1,38 @@
+package com.cool.store.dto.auth;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * describe:
+ *
+ * @author zhouyiping
+ * @date 2020/10/10
+ */
+@Data
+public class AuthRegionStoreUserDTO {
+
+    private String id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 是否是门店
+     */
+    @JsonProperty("store_flag")
+    private Boolean storeFlag ;
+
+    /**
+     * 权限来源 create-数智门店创建  sync-钉钉同步
+     */
+    private String source;
+
+    /**
+     * 门店类型区域对应的 门店id
+     */
+    @JsonProperty("store_id")
+    private String storeId;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthStoreCountDTO.java

@@ -0,0 +1,20 @@
+package com.cool.store.dto.auth;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * describe:
+ *
+ * @author zhouyiping
+ * @date 2020/11/17
+ */
+@Data
+public class AuthStoreCountDTO {
+
+    private String userId;
+    private List<String> storeList;
+    private Integer storeCount;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/buser/MySubordinatesDTO.java

@@ -0,0 +1,27 @@
+package com.cool.store.dto.buser;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2022/2/28 17:27
+ * @Version 1.0
+ */
+@Data
+public class MySubordinatesDTO {
+
+    /**
+     * 映射ID
+     */
+    String regionId;
+
+    String regionName;
+
+    String personalId;
+
+    String personalName;
+    /**
+     * 节点类型 区域 人员
+     */
+    String nodeType;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/buser/SubordinateUserRangeDTO.java

@@ -0,0 +1,35 @@
+package com.cool.store.dto.buser;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName SubordinateUserRangeDTO
+ * @Description 用户管辖范围
+ * @author wxp
+ */
+@Data
+public class SubordinateUserRangeDTO {
+
+    private String userId;
+
+    /**
+     * 管辖用户范围：self-仅自己，all-全部人员，define-自定义
+     */
+    private String subordinateUserRange;
+
+    /**
+     * auto自动关联 select手动选择
+     */
+    private List<String> sourceList;
+
+    /**
+     * 我的下属集合
+     */
+    private List<MySubordinatesDTO> mySubordinates;
+
+
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserRoleDTO.java

@@ -0,0 +1,22 @@
+package com.cool.store.dto.buser;
+
+import lombok.Data;
+
+/**
+ * describe:
+ *
+ * @author zhouyiping
+ * @date 2020/11/06
+ */
+@Data
+public class UserRoleDTO {
+    private String userId;
+    private String roleName;
+    private String roleAuth;
+    private Long roleId;
+    private Integer priority;
+
+    private String roleEnum;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/region/RegionPathDTO.java

@@ -0,0 +1,27 @@
+package com.cool.store.dto.region;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author 邵凌志
+ * @date 2020/12/22 13:48
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RegionPathDTO {
+
+    private String regionId;
+
+    private String regionPath;
+
+    private Integer storeNum;
+
+    private String regionName;
+
+    private String regionType;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/response/ResultDTO.java

@@ -0,0 +1,99 @@
+package com.cool.store.dto.response;
+
+
+import java.io.Serializable;
+
+/**
+ * rpc统一返回实体类
+ *
+ * @author byd
+ */
+public class ResultDTO<T extends Object> implements Serializable {
+
+    private static final long serialVersionUID = -2217360460304088285L;
+
+    private boolean success = true;
+    /**
+     * 返回码
+     */
+    private int code;
+
+    /**
+     * 返回信息
+     */
+    private String message;
+
+    /**
+     * 返回数据
+     */
+    private T data;
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public ResultDTO() {
+        super();
+    }
+
+    public ResultDTO(T data) {
+        super();
+        this.data = data;
+    }
+
+    public ResultDTO(int code, String message, T data) {
+        this.code = code;
+        this.message = message;
+        this.data = data;
+    }
+
+    public ResultDTO(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static ResultDTO successResult() {
+        return new ResultDTO(200000, "请求成功");
+    }
+
+    public static ResultDTO successResult(Object data) {
+        return new ResultDTO(200000, "请求成功", data);
+    }
+
+    public static ResultDTO failResult(String msg) {
+        return new ResultDTO(400000, msg);
+    }
+
+    public static ResultDTO failResult(int code, String msg) {
+        return new ResultDTO(code, msg);
+    }
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreAreaDTO.java

@@ -0,0 +1,48 @@
+package com.cool.store.dto.store;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * describe:
+ *
+ * @author zhouyiping
+ * @date 2020/10/22
+ */
+@Data
+public class StoreAreaDTO {
+
+    private String storeId;
+    private String storeName;
+    /**
+     * 门店所属区域的全部节点信息
+     */
+    private String regionPath;
+ 
+    /**
+     * 门店挂靠的区域Id
+     */
+    private String areaId;
+
+    /**
+     * 门店的挂挂靠的父节点区域ID
+     */
+    private List<String> areaIdList;
+
+    /**
+     * 所属区域id
+     */
+    private Long regionId;
+
+    private String storeStatus;
+
+
+    public List<String> getAreaIdList(){
+       return StrUtil.splitTrim(regionPath,"/");
+    }
+
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/usergroup/UserGroupAddRequest.java

@@ -0,0 +1,33 @@
+package com.cool.store.dto.usergroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+
+/**
+ * @author wxp
+ */
+@ApiModel(value = "分组创建")
+@Data
+public class UserGroupAddRequest {
+
+    @ApiModelProperty("分组id")
+    private String groupId;
+
+    @ApiModelProperty(value = "分组名称", required = true)
+    @NotBlank(message = "分组名称不能为空")
+    @Length(max = 100, message = "名称最多100个字")
+    private String groupName;
+
+    @ApiModelProperty("共同编辑人userId集合")
+    private List<String> commonEditUserIdList;
+
+    @ApiModelProperty("配置用户userId集合")
+    private List<String> userIdList;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/usergroup/UserGroupDTO.java

@@ -0,0 +1,24 @@
+package com.cool.store.dto.usergroup;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 用户分组dto
+ * @ClassName: UserGroupDTO
+ * @Author: wxp
+ * @Date: 2023/1/5 16:04
+ */
+@Data
+public class UserGroupDTO {
+
+    @ApiModelProperty("组别id")
+    private String groupId;
+
+    @ApiModelProperty("组别名称")
+    private String groupName;
+
+
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserGroupDO.java

@@ -0,0 +1,47 @@
+package com.cool.store.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 
+ * @author   zhangchenbiao
+ * @date   2023-05-31 02:43
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EnterpriseUserGroupDO implements Serializable {
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("组别id")
+    private String groupId;
+
+    @ApiModelProperty("组别名称")
+    private String groupName;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("创建人id")
+    private String createUserId;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("更新人")
+    private String updateUserId;
+
+    @ApiModelProperty("删除标识")
+    private Boolean deleted;
+
+    @ApiModelProperty("共同编辑人userId集合（前后逗号分隔）")
+    private String commonEditUserids;
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserGroupMappingDO.java

@@ -0,0 +1,44 @@
+package com.cool.store.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 
+ * @author   zhangchenbiao
+ * @date   2023-05-31 02:43
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EnterpriseUserGroupMappingDO implements Serializable {
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("用户id")
+    private String userId;
+
+    @ApiModelProperty("组别id")
+    private String groupId;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("创建人id")
+    private String createUserId;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("更新人")
+    private String updateUserId;
+
+    @ApiModelProperty("删除标识")
+    private Boolean deleted;
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java

@@ -0,0 +1,133 @@
+package com.cool.store.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 
+ * @author   zhangchenbiao
+ * @date   2023-05-31 11:51
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StoreDO implements Serializable {
+    @ApiModelProperty("自增ID")
+    private Long id;
+
+    @ApiModelProperty("门店ID")
+    private String storeId;
+
+    @ApiModelProperty("门店名称")
+    private String storeName;
+
+    @ApiModelProperty("门店编号")
+    private String storeNum;
+
+    @ApiModelProperty("门头照")
+    private String avatar;
+
+    @ApiModelProperty("钉钉id")
+    private String dingId;
+
+    @ApiModelProperty("所属区域id")
+    private Long regionId;
+
+    @ApiModelProperty("省")
+    private String province;
+
+    @ApiModelProperty("市")
+    private String city;
+
+    @ApiModelProperty("区")
+    private String county;
+
+    @ApiModelProperty("门店地址")
+    private String storeAddress;
+
+    @ApiModelProperty("定位地址")
+    private String locationAddress;
+
+    @ApiModelProperty("锁定定位:locked/锁定,not_locked/未锁定")
+    private String isLock;
+
+    @ApiModelProperty("经纬度")
+    private String longitudeLatitude;
+
+    @ApiModelProperty("经度")
+    private String longitude;
+
+    @ApiModelProperty("纬度")
+    private String latitude;
+
+    @ApiModelProperty("状态:effective/有效,invalid/失效,ignored/不可用, unSync/未同步")
+    private String isDelete;
+
+    @ApiModelProperty("电话号码")
+    private String telephone;
+
+    @ApiModelProperty("营业时间")
+    private String businessHours;
+
+    @ApiModelProperty("门店面积")
+    private String storeAcreage;
+
+    @ApiModelProperty("门店带宽")
+    private String storeBandwidth;
+
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+
+    @ApiModelProperty("创建人")
+    private String createName;
+
+    @ApiModelProperty("创建人id")
+    private String createUser;
+
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    @ApiModelProperty("更新人")
+    private String updateName;
+
+    @ApiModelProperty("修改人id")
+    private String updateUser;
+
+    @ApiModelProperty("阿里云corpId")
+    private String aliyunCorpId;
+
+    @ApiModelProperty("门店来源")
+    private String source;
+
+    @ApiModelProperty("vds的corpId")
+    private String vdsCorpId;
+
+    @ApiModelProperty("dinging部门id")
+    private String synDingDeptId;
+
+    @ApiModelProperty("区域路径")
+    private String regionPath;
+
+    @ApiModelProperty("是否绑定绑定摄像头，0:未绑定;1:已绑定")
+    private Boolean hasCamera;
+
+    @ApiModelProperty("门店状态（open：营业；closed：闭店；not_open：未开业）")
+    private String storeStatus;
+
+    @ApiModelProperty("第三方唯一id")
+    private String thirdDeptId;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("动态扩展字段")
+    private String extendField;
+
+    @ApiModelProperty("地址经纬度point")
+    private byte[] addressPoint;
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/SubordinateMappingDO.java

@@ -0,0 +1,52 @@
+package com.cool.store.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 
+ * @author   zhangchenbiao
+ * @date   2023-05-31 02:27
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SubordinateMappingDO implements Serializable {
+    @ApiModelProperty("主键")
+    private Integer id;
+
+    @ApiModelProperty("用户ID")
+    private String userId;
+
+    @ApiModelProperty("部门ID")
+    private String regionId;
+
+    @ApiModelProperty("人员ID")
+    private String personalId;
+
+    @ApiModelProperty("0 下属 ， 1 直属上级")
+    private Integer type;
+
+    @ApiModelProperty("创建人")
+    private String createId;
+
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateId;
+
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    @ApiModelProperty("管辖用户范围：self-仅自己，all-全部人员，define-自定义")
+    private String userRange;
+
+    @ApiModelProperty("auto自动关联 select手动选择")
+    private String source;
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/buser/EnterpriseUserPageVO.java

@@ -0,0 +1,121 @@
+package com.cool.store.vo.buser;
+
+import com.cool.store.dto.auth.AuthRegionStoreUserDTO;
+import com.cool.store.dto.buser.MySubordinatesDTO;
+import com.cool.store.dto.usergroup.UserGroupDTO;
+import com.cool.store.entity.EnterpriseUserDO;
+import com.cool.store.utils.UUIDUtils;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 
+ * @author   zhangchenbiao
+ * @date   2022-01-18 04:40
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EnterpriseUserPageVO implements Serializable {
+
+    @ApiModelProperty("钉钉用户id")
+    private String userId;
+
+    @ApiModelProperty("")
+    private String name;
+
+    @ApiModelProperty("是否已经激活, true表示已激活, false表示未激活")
+    private Boolean active;
+
+    @ApiModelProperty("是否是主管理员，0：否，1：是")
+    private Boolean mainAdmin;
+
+    @ApiModelProperty("是否为企业的管理员, true表示是, false表示不是")
+    private Boolean isAdmin;
+
+    @ApiModelProperty("手机号码")
+    private String mobile;
+
+    @ApiModelProperty("员工的电子邮箱")
+    private String email;
+
+    @ApiModelProperty("在当前isv全局范围内唯一标识一个用户的身份,用户无法修改")
+    private String unionid;
+
+    @ApiModelProperty("员工的企业邮箱")
+    private String orgEmail;
+
+    @ApiModelProperty("头像url")
+    private String avatar;
+
+    @ApiModelProperty("")
+    private String roles;
+
+    @ApiModelProperty("工号")
+    private String jobnumber;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("")
+    private String roleName;
+
+    @ApiModelProperty("部门")
+    private String departments;
+
+    @ApiModelProperty("用户状态 0待审核 1正常 2冻结")
+    private Integer userStatus;
+
+    @ApiModelProperty("门店数量")
+    private Integer storeCount;
+
+    private String department;
+
+    @ApiModelProperty("用户分组")
+    private List<UserGroupDTO> userGroupList;
+
+    @ApiModelProperty("管辖用户范围")
+    private String subordinateUserRange;
+
+    @ApiModelProperty("auto自动关联 select手动选择")
+    private List<String> sourceList;
+
+    @ApiModelProperty("我的下属集合")
+    private List<MySubordinatesDTO> mySubordinates;
+
+    private List<AuthRegionStoreUserDTO>  authRegionStoreList;
+
+    @ApiModelProperty("选取权限 true可选 false不可选")
+    private Boolean selectFlag;
+
+
+    public static List<EnterpriseUserPageVO> transUserDOToVO(List<EnterpriseUserDO> enterpriseUserList) {
+        List<EnterpriseUserPageVO> resultList = new ArrayList<>();
+        for (EnterpriseUserDO enterpriseUserDTO : enterpriseUserList) {
+            EnterpriseUserPageVO enterpriseUserDO = new EnterpriseUserPageVO();
+            enterpriseUserDO.setUserId(enterpriseUserDTO.getUserId());
+            enterpriseUserDO.setName(enterpriseUserDTO.getName());
+            enterpriseUserDO.setActive(Boolean.TRUE);
+            enterpriseUserDO.setMainAdmin(enterpriseUserDTO.getMainAdmin());
+            enterpriseUserDO.setIsAdmin(enterpriseUserDTO.getIsAdmin());
+            enterpriseUserDO.setMobile(enterpriseUserDTO.getMobile());
+            enterpriseUserDO.setEmail(enterpriseUserDTO.getEmail());
+            enterpriseUserDO.setOrgEmail(enterpriseUserDTO.getOrgEmail());
+            enterpriseUserDO.setUnionid(enterpriseUserDTO.getUnionid());
+            enterpriseUserDO.setAvatar(enterpriseUserDTO.getAvatar());
+            enterpriseUserDO.setJobnumber(enterpriseUserDTO.getJobnumber());
+            enterpriseUserDO.setRemark(enterpriseUserDTO.getRemark());
+            resultList.add(enterpriseUserDO);
+        }
+        return resultList;
+    }
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/usergroup/UserGroupVO.java

@@ -0,0 +1,47 @@
+package com.cool.store.vo.usergroup;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class UserGroupVO {
+
+    @ApiModelProperty("分组名称")
+    private String groupName;
+
+    @ApiModelProperty("分组id")
+    private String groupId;
+
+    @ApiModelProperty("人员数量")
+    private Integer userCount;
+
+    private List<UserSimpleDTO> commonEditUserList;
+
+    @ApiModelProperty("更新人")
+    private String updateUserName;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("更新人")
+    private String updateUserId;
+
+    @ApiModelProperty("创建人")
+    private String createUserName;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("创建人id")
+    private String createUserId;
+
+    @ApiModelProperty("配置用户集合")
+    private List<UserSimpleDTO> configUserList;
+
+    @ApiModelProperty("编辑权限")
+    private Boolean editFlag;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/usergroup/UserSimpleDTO.java

@@ -0,0 +1,20 @@
+package com.cool.store.vo.usergroup;
+
+import lombok.Data;
+
+/**
+ * @author ：xugangkun
+ * @date ：2022/3/8 14:22
+ */
+@Data
+public class UserSimpleDTO {
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+}