BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 8ae3401452af2cb3cec75e1d1ee4197ca9855777

Authored by owen
1 parent de835312

会员: 增加会员分组功能

Inline Side-by-side
Showing 25 changed files with 807 additions and 29 deletions
sql/mysql/member_group.sql 0 → 100644
  View file @8ae3401
  1 +create table member_group
  2 +(
  3 + id bigint auto_increment comment '编号' primary key,
  4 + name varchar(30) default '' not null comment '名称',
  5 + remark varchar(255) default '' not null comment '备注',
  6 + status tinyint default 0 not null comment '状态',
  7 + creator varchar(64) default '' null comment '创建者',
  8 + create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间',
  9 + updater varchar(64) default '' null comment '更新者',
  10 + update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间',
  11 + deleted bit default b'0' not null comment '是否删除',
  12 + tenant_id bigint default 0 not null comment '租户编号'
  13 +)
  14 + comment '用户分组';
  15 +
  16 +alter table member_user add column group_id bigint null comment '用户分组编号';
  17 +
  18 +-- 菜单 SQL
  19 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name)
  20 +VALUES ('用户分组', '', 2, 5, 2262, 'group', '', 'member/group/index', 0, 'MemberGroup');
  21 +
  22 +-- 按钮父菜单ID
  23 +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
  24 +SELECT @parentId := LAST_INSERT_ID();
  25 +
  26 +-- 按钮 SQL
  27 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
  28 +VALUES ('用户分组查询', 'member:group:query', 3, 1, @parentId, '', '', '', 0);
  29 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
  30 +VALUES ('用户分组创建', 'member:group:create', 3, 2, @parentId, '', '', '', 0);
  31 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
  32 +VALUES ('用户分组更新', 'member:group:update', 3, 3, @parentId, '', '', '', 0);
  33 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
  34 +VALUES ('用户分组删除', 'member:group:delete', 3, 4, @parentId, '', '', '', 0);
  35 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
  36 +VALUES ('用户分组导出', 'member:group:export', 3, 5, @parentId, '', '', '', 0);
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
  View file @8ae3401
... ... @@ -52,4 +52,9 @@ public interface ErrorCodeConstants {
52 52 ErrorCode LEVEL_LOG_NOT_EXISTS = new ErrorCode(1004007100, "会员等级记录不存在");
53 53 ErrorCode EXPERIENCE_LOG_NOT_EXISTS = new ErrorCode(1004007200, "会员经验记录不存在");
54 54 ErrorCode LEVEL_REASON_NOT_EXISTS = new ErrorCode(1004007300, "会员等级调整原因不能为空");
  55 +
  56 + //========== 用户分组 1004011000 ==========
  57 + ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1004011000, "用户分组不存在");
  58 + ErrorCode GROUP_HAS_USER = new ErrorCode(1004011001, "用户分组下存在用户，无法删除");
  59 +
55 60 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/MemberGroupController.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.controller.admin.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.*;
  6 +import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  8 +import cn.iocoder.yudao.module.member.service.group.MemberGroupService;
  9 +import io.swagger.v3.oas.annotations.Operation;
  10 +import io.swagger.v3.oas.annotations.Parameter;
  11 +import io.swagger.v3.oas.annotations.tags.Tag;
  12 +import org.springframework.security.access.prepost.PreAuthorize;
  13 +import org.springframework.validation.annotation.Validated;
  14 +import org.springframework.web.bind.annotation.*;
  15 +
  16 +import javax.annotation.Resource;
  17 +import javax.validation.Valid;
  18 +import java.util.Collection;
  19 +import java.util.List;
  20 +
  21 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  22 +
  23 +
  24 +@Tag(name = "管理后台 - 用户分组")
  25 +@RestController
  26 +@RequestMapping("/member/group")
  27 +@Validated
  28 +public class MemberGroupController {
  29 +
  30 + @Resource
  31 + private MemberGroupService groupService;
  32 +
  33 + @PostMapping("/create")
  34 + @Operation(summary = "创建用户分组")
  35 + @PreAuthorize("@ss.hasPermission('member:group:create')")
  36 + public CommonResult<Long> createGroup(@Valid @RequestBody MemberGroupCreateReqVO createReqVO) {
  37 + return success(groupService.createGroup(createReqVO));
  38 + }
  39 +
  40 + @PutMapping("/update")
  41 + @Operation(summary = "更新用户分组")
  42 + @PreAuthorize("@ss.hasPermission('member:group:update')")
  43 + public CommonResult<Boolean> updateGroup(@Valid @RequestBody MemberGroupUpdateReqVO updateReqVO) {
  44 + groupService.updateGroup(updateReqVO);
  45 + return success(true);
  46 + }
  47 +
  48 + @DeleteMapping("/delete")
  49 + @Operation(summary = "删除用户分组")
  50 + @Parameter(name = "id", description = "编号", required = true)
  51 + @PreAuthorize("@ss.hasPermission('member:group:delete')")
  52 + public CommonResult<Boolean> deleteGroup(@RequestParam("id") Long id) {
  53 + groupService.deleteGroup(id);
  54 + return success(true);
  55 + }
  56 +
  57 + @GetMapping("/get")
  58 + @Operation(summary = "获得用户分组")
  59 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  60 + @PreAuthorize("@ss.hasPermission('member:group:query')")
  61 + public CommonResult<MemberGroupRespVO> getGroup(@RequestParam("id") Long id) {
  62 + MemberGroupDO group = groupService.getGroup(id);
  63 + return success(MemberGroupConvert.INSTANCE.convert(group));
  64 + }
  65 +
  66 + @GetMapping("/list")
  67 + @Operation(summary = "获得用户分组列表")
  68 + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
  69 + @PreAuthorize("@ss.hasPermission('member:group:query')")
  70 + public CommonResult<List<MemberGroupRespVO>> getGroupList(@RequestParam("ids") Collection<Long> ids) {
  71 + List<MemberGroupDO> list = groupService.getGroupList(ids);
  72 + return success(MemberGroupConvert.INSTANCE.convertList(list));
  73 + }
  74 +
  75 + @GetMapping("/list-all-simple")
  76 + @Operation(summary = "获取会员分组精简信息列表", description = "只包含被开启的会员分组，主要用于前端的下拉选项")
  77 + public CommonResult<List<MemberGroupSimpleRespVO>> getSimpleGroupList() {
  78 + // 获用户列表，只要开启状态的
  79 + List<MemberGroupDO> list = groupService.getEnableGroupList();
  80 + return success(MemberGroupConvert.INSTANCE.convertSimpleList(list));
  81 + }
  82 +
  83 + @GetMapping("/page")
  84 + @Operation(summary = "获得用户分组分页")
  85 + @PreAuthorize("@ss.hasPermission('member:group:query')")
  86 + public CommonResult<PageResult<MemberGroupRespVO>> getGroupPage(@Valid MemberGroupPageReqVO pageVO) {
  87 + PageResult<MemberGroupDO> pageResult = groupService.getGroupPage(pageVO);
  88 + return success(MemberGroupConvert.INSTANCE.convertPage(pageResult));
  89 + }
  90 +
  91 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupBaseVO.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +/**
  9 + * 用户分组 Base VO，提供给添加、修改、详细的子 VO 使用
  10 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  11 + */
  12 +@Data
  13 +public class MemberGroupBaseVO {
  14 +
  15 + @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "购物达人")
  16 + @NotNull(message = "名称不能为空")
  17 + private String name;
  18 +
  19 + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
  20 + private String remark;
  21 +
  22 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  23 + @NotNull(message = "状态不能为空")
  24 + private Integer status;
  25 +
  26 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +@Schema(description = "管理后台 - 用户分组创建 Request VO")
  9 +@Data
  10 +@EqualsAndHashCode(callSuper = true)
  11 +@ToString(callSuper = true)
  12 +public class MemberGroupCreateReqVO extends MemberGroupBaseVO {
  13 +
  14 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import java.time.LocalDateTime;
  11 +
  12 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  13 +
  14 +@Schema(description = "管理后台 - 用户分组分页 Request VO")
  15 +@Data
  16 +@EqualsAndHashCode(callSuper = true)
  17 +@ToString(callSuper = true)
  18 +public class MemberGroupPageReqVO extends PageParam {
  19 +
  20 + @Schema(description = "名称", example = "购物达人")
  21 + private String name;
  22 +
  23 + @Schema(description = "状态", example = "1")
  24 + private Integer status;
  25 +
  26 + @Schema(description = "创建时间")
  27 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  28 + private LocalDateTime[] createTime;
  29 +
  30 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupRespVO.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import java.time.LocalDateTime;
  9 +
  10 +@Schema(description = "管理后台 - 用户分组 Response VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MemberGroupRespVO extends MemberGroupBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357")
  17 + private Long id;
  18 +
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  20 + private LocalDateTime createTime;
  21 +
  22 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.ToString;
  6 +
  7 +@Schema(description = "管理后台 - 用户分组 Response VO")
  8 +@Data
  9 +@ToString(callSuper = true)
  10 +public class MemberGroupSimpleRespVO {
  11 +
  12 + @Schema(description = "编号", example = "6103")
  13 + private Long id;
  14 +
  15 + @Schema(description = "等级名称", example = "芋艿")
  16 + private String name;
  17 +
  18 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import javax.validation.constraints.NotNull;
  9 +
  10 +@Schema(description = "管理后台 - 用户分组更新 Request VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MemberGroupUpdateReqVO extends MemberGroupBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357")
  17 + @NotNull(message = "编号不能为空")
  18 + private Long id;
  19 +
  20 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelSimpleRespVO.java
  View file @8ae3401
... ... @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.member.controller.admin.level.vo;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5   -import lombok.EqualsAndHashCode;
6 5 import lombok.ToString;
7 6  
8 7 /**
... ... @@ -10,9 +9,8 @@ import lombok.ToString;
10 9 */
11 10 @Schema(description = "管理后台 - 会员等级 Response VO")
12 11 @Data
13   -@EqualsAndHashCode(callSuper = true)
14 12 @ToString(callSuper = true)
15   -public class MemberLevelSimpleRespVO extends MemberLevelBaseVO {
  13 +public class MemberLevelSimpleRespVO {
16 14  
17 15 @Schema(description = "编号", example = "6103")
18 16 private Long id;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
  View file @8ae3401
... ... @@ -7,9 +7,11 @@ import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReq
7 7 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO;
8 8 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
9 9 import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
10 11 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
11 12 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
12 13 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
  14 +import cn.iocoder.yudao.module.member.service.group.MemberGroupService;
13 15 import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
14 16 import cn.iocoder.yudao.module.member.service.tag.MemberTagService;
15 17 import cn.iocoder.yudao.module.member.service.user.MemberUserService;
... ... @@ -22,10 +24,7 @@ import org.springframework.web.bind.annotation.*;
22 24  
23 25 import javax.annotation.Resource;
24 26 import javax.validation.Valid;
25   -import java.util.Collection;
26   -import java.util.List;
27   -import java.util.Objects;
28   -import java.util.Set;
  27 +import java.util.*;
29 28 import java.util.stream.Collectors;
30 29  
31 30 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
... ... @@ -42,6 +41,8 @@ public class MemberUserController {
42 41 private MemberTagService memberTagService;
43 42 @Resource
44 43 private MemberLevelService memberLevelService;
  44 + @Resource
  45 + private MemberGroupService memberGroupService;
45 46  
46 47 @PutMapping("/update")
47 48 @Operation(summary = "更新会员用户")
... ... @@ -69,18 +70,27 @@ public class MemberUserController {
69 70 return success(PageResult.empty());
70 71 }
71 72  
72   - // 处理会员标签返显
  73 + Set<Long> groupIds = new HashSet<>(pageResult.getList().size());
  74 +
  75 + // 处理用户标签返显
73 76 Set<Long> tagIds = pageResult.getList().stream()
  77 + .peek(m -> {
  78 + if (m.getGroupId() != null) {
  79 + groupIds.add(m.getGroupId());
  80 + }
  81 + })
74 82 .map(MemberUserDO::getTagIds)
75 83 .filter(Objects::nonNull)
76 84 .flatMap(Collection::stream)
77 85 .collect(Collectors.toSet());
78 86 List<MemberTagDO> tags = memberTagService.getTagList(tagIds);
79 87  
80   - // 处理会员级别返显
  88 + // 处理用户级别返显
81 89 List<MemberLevelDO> levels = memberLevelService.getEnableLevelList();
  90 + // 处理用户分组返显
  91 + List<MemberGroupDO> groups = memberGroupService.getGroupList(groupIds);
82 92  
83   - return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels));
  93 + return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels, groups));
84 94 }
85 95  
86 96 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
  View file @8ae3401
... ... @@ -56,4 +56,7 @@ public class MemberUserBaseVO {
56 56 @Schema(description = "会员等级编号", example = "1")
57 57 private Long levelId;
58 58  
  59 + @Schema(description = "用户分组编号", example = "1")
  60 + private Long groupId;
  61 +
59 62 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java
  View file @8ae3401
... ... @@ -35,7 +35,10 @@ public class MemberUserPageReqVO extends PageParam {
35 35 @Schema(description = "会员标签编号列表", example = "[1, 2]")
36 36 private List<Long> tagIds;
37 37  
38   - @Schema(description = "会员等级标号", example = "1")
  38 + @Schema(description = "会员等级编号", example = "1")
39 39 private Long levelId;
40 40  
  41 + @Schema(description = "用户分组编号", example = "1")
  42 + private Long groupId;
  43 +
41 44 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java
  View file @8ae3401
... ... @@ -38,4 +38,7 @@ public class MemberUserRespVO extends MemberUserBaseVO {
38 38 @Schema(description = "会员等级", example = "黄金会员")
39 39 private String levelName;
40 40  
  41 + @Schema(description = "用户分组", example = "购物达人")
  42 + private String groupName;
  43 +
41 44 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/group/MemberGroupConvert.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.convert.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  5 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupRespVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupSimpleRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  9 +import org.mapstruct.Mapper;
  10 +import org.mapstruct.factory.Mappers;
  11 +
  12 +import java.util.List;
  13 +
  14 +/**
  15 + * 用户分组 Convert
  16 + *
  17 + * @author owen
  18 + */
  19 +@Mapper
  20 +public interface MemberGroupConvert {
  21 +
  22 + MemberGroupConvert INSTANCE = Mappers.getMapper(MemberGroupConvert.class);
  23 +
  24 + MemberGroupDO convert(MemberGroupCreateReqVO bean);
  25 +
  26 + MemberGroupDO convert(MemberGroupUpdateReqVO bean);
  27 +
  28 + MemberGroupRespVO convert(MemberGroupDO bean);
  29 +
  30 + List<MemberGroupRespVO> convertList(List<MemberGroupDO> list);
  31 +
  32 + PageResult<MemberGroupRespVO> convertPage(PageResult<MemberGroupDO> page);
  33 +
  34 + List<MemberGroupSimpleRespVO> convertSimpleList(List<MemberGroupDO> list);
  35 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
  View file @8ae3401
... ... @@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
7 7 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO;
8 8 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
9 9 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
10 11 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
11 12 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
12 13 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
... ... @@ -38,17 +39,20 @@ public interface MemberUserConvert {
38 39  
39 40 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult,
40 41 List<MemberTagDO> tags,
41   - List<MemberLevelDO> levels) {
  42 + List<MemberLevelDO> levels,
  43 + List<MemberGroupDO> groups) {
42 44 PageResult<MemberUserRespVO> result = convertPage(pageResult);
43 45  
44 46 // 处理关联数据
45 47 Map<Long, String> tagMap = convertMap(tags, MemberTagDO::getId, MemberTagDO::getName);
46 48 Map<Long, String> levelMap = convertMap(levels, MemberLevelDO::getId, MemberLevelDO::getName);
  49 + Map<Long, String> groupMap = convertMap(groups, MemberGroupDO::getId, MemberGroupDO::getName);
47 50  
48 51 // 填充关联数据
49 52 for (MemberUserRespVO vo : result.getList()) {
50 53 vo.setTagNames(convertList(vo.getTagIds(), tagMap::get));
51 54 vo.setLevelName(MapUtil.getStr(levelMap, vo.getLevelId(), StrUtil.EMPTY));
  55 + vo.setGroupName(MapUtil.getStr(groupMap, vo.getGroupId(), StrUtil.EMPTY));
52 56 }
53 57 return result;
54 58 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/group/MemberGroupDO.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.dal.dataobject.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.*;
  9 +
  10 +/**
  11 + * 用户分组 DO
  12 + *
  13 + * @author owen
  14 + */
  15 +@TableName("member_group")
  16 +@KeySequence("member_group_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  17 +@Data
  18 +@EqualsAndHashCode(callSuper = true)
  19 +@ToString(callSuper = true)
  20 +@Builder
  21 +@NoArgsConstructor
  22 +@AllArgsConstructor
  23 +public class MemberGroupDO extends BaseDO {
  24 +
  25 + /**
  26 + * 编号
  27 + */
  28 + @TableId
  29 + private Long id;
  30 + /**
  31 + * 名称
  32 + */
  33 + private String name;
  34 + /**
  35 + * 备注
  36 + */
  37 + private String remark;
  38 + /**
  39 + * 状态
  40 + * <p>
  41 + * 枚举 {@link CommonStatusEnum}
  42 + */
  43 + private Integer status;
  44 +
  45 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
  View file @8ae3401
... ... @@ -124,6 +124,10 @@ public class MemberUserDO extends TenantBaseDO {
124 124 * 会员经验
125 125 */
126 126 private Integer experience;
  127 + /**
  128 + * 用户分组编号
  129 + */
  130 + private Long groupId;
127 131  
128 132 // TODO 积分等等
129 133 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/group/MemberGroupMapper.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.dal.mysql.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * 用户分组 Mapper
  14 + *
  15 + * @author owen
  16 + */
  17 +@Mapper
  18 +public interface MemberGroupMapper extends BaseMapperX<MemberGroupDO> {
  19 +
  20 + default PageResult<MemberGroupDO> selectPage(MemberGroupPageReqVO reqVO) {
  21 + return selectPage(reqVO, new LambdaQueryWrapperX<MemberGroupDO>()
  22 + .likeIfPresent(MemberGroupDO::getName, reqVO.getName())
  23 + .eqIfPresent(MemberGroupDO::getStatus, reqVO.getStatus())
  24 + .betweenIfPresent(MemberGroupDO::getCreateTime, reqVO.getCreateTime())
  25 + .orderByDesc(MemberGroupDO::getId));
  26 + }
  27 +
  28 + default List<MemberGroupDO> selectListByStatus(Integer status) {
  29 + return selectList(MemberGroupDO::getStatus, status);
  30 + }
  31 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
  View file @8ae3401
... ... @@ -45,6 +45,7 @@ public interface MemberUserMapper extends BaseMapperX&lt;MemberUserDO&gt; {
45 45 .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname())
46 46 .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime())
47 47 .eqIfPresent(MemberUserDO::getLevelId, reqVO.getLevelId())
  48 + .eqIfPresent(MemberUserDO::getGroupId, reqVO.getGroupId())
48 49 .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql)
49 50 .orderByDesc(MemberUserDO::getId));
50 51 }
... ... @@ -61,4 +62,8 @@ public interface MemberUserMapper extends BaseMapperX&lt;MemberUserDO&gt; {
61 62 .set(MemberUserDO::getExperience, 0)
62 63 .set(MemberUserDO::getLevelId, null));
63 64 }
  65 +
  66 + default Long selectCountByGroupId(Long groupId) {
  67 + return selectCount(MemberUserDO::getGroupId, groupId);
  68 + }
64 69 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.service.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  9 +
  10 +import javax.validation.Valid;
  11 +import java.util.Collection;
  12 +import java.util.List;
  13 +
  14 +/**
  15 + * 用户分组 Service 接口
  16 + *
  17 + * @author owen
  18 + */
  19 +public interface MemberGroupService {
  20 +
  21 + /**
  22 + * 创建用户分组
  23 + *
  24 + * @param createReqVO 创建信息
  25 + * @return 编号
  26 + */
  27 + Long createGroup(@Valid MemberGroupCreateReqVO createReqVO);
  28 +
  29 + /**
  30 + * 更新用户分组
  31 + *
  32 + * @param updateReqVO 更新信息
  33 + */
  34 + void updateGroup(@Valid MemberGroupUpdateReqVO updateReqVO);
  35 +
  36 + /**
  37 + * 删除用户分组
  38 + *
  39 + * @param id 编号
  40 + */
  41 + void deleteGroup(Long id);
  42 +
  43 + /**
  44 + * 获得用户分组
  45 + *
  46 + * @param id 编号
  47 + * @return 用户分组
  48 + */
  49 + MemberGroupDO getGroup(Long id);
  50 +
  51 + /**
  52 + * 获得用户分组列表
  53 + *
  54 + * @param ids 编号
  55 + * @return 用户分组列表
  56 + */
  57 + List<MemberGroupDO> getGroupList(Collection<Long> ids);
  58 +
  59 + /**
  60 + * 获得用户分组分页
  61 + *
  62 + * @param pageReqVO 分页查询
  63 + * @return 用户分组分页
  64 + */
  65 + PageResult<MemberGroupDO> getGroupPage(MemberGroupPageReqVO pageReqVO);
  66 +
  67 +
  68 + /**
  69 + * 获得指定状态的用户分组列表
  70 + *
  71 + * @param status 状态
  72 + * @return 用户分组列表
  73 + */
  74 + List<MemberGroupDO> getGroupListByStatus(Integer status);
  75 +
  76 +
  77 + /**
  78 + * 获得开启状态的用户分组列表
  79 + *
  80 + * @return 用户分组列表
  81 + */
  82 + default List<MemberGroupDO> getEnableGroupList() {
  83 + return getGroupListByStatus(CommonStatusEnum.ENABLE.getStatus());
  84 + }
  85 +
  86 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.service.group;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.collection.ListUtil;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  8 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  9 +import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  11 +import cn.iocoder.yudao.module.member.dal.mysql.group.MemberGroupMapper;
  12 +import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;
  13 +import org.springframework.stereotype.Service;
  14 +import org.springframework.validation.annotation.Validated;
  15 +
  16 +import javax.annotation.Resource;
  17 +import java.util.Collection;
  18 +import java.util.List;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  21 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_HAS_USER;
  22 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_NOT_EXISTS;
  23 +
  24 +/**
  25 + * 用户分组 Service 实现类
  26 + *
  27 + * @author owen
  28 + */
  29 +@Service
  30 +@Validated
  31 +public class MemberGroupServiceImpl implements MemberGroupService {
  32 +
  33 + @Resource
  34 + private MemberGroupMapper groupMapper;
  35 + @Resource
  36 + private MemberUserMapper memberUserMapper;
  37 +
  38 + @Override
  39 + public Long createGroup(MemberGroupCreateReqVO createReqVO) {
  40 + // 插入
  41 + MemberGroupDO group = MemberGroupConvert.INSTANCE.convert(createReqVO);
  42 + groupMapper.insert(group);
  43 + // 返回
  44 + return group.getId();
  45 + }
  46 +
  47 + @Override
  48 + public void updateGroup(MemberGroupUpdateReqVO updateReqVO) {
  49 + // 校验存在
  50 + validateGroupExists(updateReqVO.getId());
  51 + // 更新
  52 + MemberGroupDO updateObj = MemberGroupConvert.INSTANCE.convert(updateReqVO);
  53 + groupMapper.updateById(updateObj);
  54 + }
  55 +
  56 + @Override
  57 + public void deleteGroup(Long id) {
  58 + // 校验存在
  59 + validateGroupExists(id);
  60 + // 校验分组下是否有用户
  61 + validateGroupHasUser(id);
  62 + // 删除
  63 + groupMapper.deleteById(id);
  64 + }
  65 +
  66 + void validateGroupExists(Long id) {
  67 + if (groupMapper.selectById(id) == null) {
  68 + throw exception(GROUP_NOT_EXISTS);
  69 + }
  70 + }
  71 +
  72 + void validateGroupHasUser(Long id) {
  73 + Long count = memberUserMapper.selectCountByGroupId(id);
  74 + if (count > 0) {
  75 + throw exception(GROUP_HAS_USER);
  76 + }
  77 + }
  78 +
  79 + @Override
  80 + public MemberGroupDO getGroup(Long id) {
  81 + return groupMapper.selectById(id);
  82 + }
  83 +
  84 + @Override
  85 + public List<MemberGroupDO> getGroupList(Collection<Long> ids) {
  86 + if (CollUtil.isEmpty(ids)) {
  87 + return ListUtil.empty();
  88 + }
  89 + return groupMapper.selectBatchIds(ids);
  90 + }
  91 +
  92 + @Override
  93 + public PageResult<MemberGroupDO> getGroupPage(MemberGroupPageReqVO pageReqVO) {
  94 + return groupMapper.selectPage(pageReqVO);
  95 + }
  96 +
  97 + @Override
  98 + public List<MemberGroupDO> getGroupListByStatus(Integer status) {
  99 + return groupMapper.selectListByStatus(status);
  100 + }
  101 +
  102 +}
... ...
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImplTest.java 0 → 100644
  View file @8ae3401
  1 +package cn.iocoder.yudao.module.member.service.group;
  2 +
  3 +import cn.hutool.core.util.RandomUtil;
  4 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  8 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  9 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  11 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
  12 +import cn.iocoder.yudao.module.member.dal.mysql.group.MemberGroupMapper;
  13 +import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;
  14 +import cn.iocoder.yudao.module.system.enums.common.SexEnum;
  15 +import org.junit.jupiter.api.Test;
  16 +import org.springframework.context.annotation.Import;
  17 +
  18 +import javax.annotation.Resource;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
  21 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
  22 +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
  23 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  24 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  25 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  26 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_HAS_USER;
  27 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_NOT_EXISTS;
  28 +import static org.junit.jupiter.api.Assertions.*;
  29 +
  30 +/**
  31 + * {@link MemberGroupServiceImpl} 的单元测试类
  32 + *
  33 + * @author owen
  34 + */
  35 +@Import(MemberGroupServiceImpl.class)
  36 +public class MemberGroupServiceImplTest extends BaseDbUnitTest {
  37 +
  38 + @Resource
  39 + private MemberGroupServiceImpl groupService;
  40 +
  41 + @Resource
  42 + private MemberGroupMapper groupMapper;
  43 + @Resource
  44 + private MemberUserMapper memberUserMapper;
  45 +
  46 + @Test
  47 + public void testCreateGroup_success() {
  48 + // 准备参数
  49 + MemberGroupCreateReqVO reqVO = randomPojo(MemberGroupCreateReqVO.class);
  50 +
  51 + // 调用
  52 + Long groupId = groupService.createGroup(reqVO);
  53 + // 断言
  54 + assertNotNull(groupId);
  55 + // 校验记录的属性是否正确
  56 + MemberGroupDO group = groupMapper.selectById(groupId);
  57 + assertPojoEquals(reqVO, group);
  58 + }
  59 +
  60 + @Test
  61 + public void testUpdateGroup_success() {
  62 + // mock 数据
  63 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class);
  64 + groupMapper.insert(dbGroup);// @Sql: 先插入出一条存在的数据
  65 + // 准备参数
  66 + MemberGroupUpdateReqVO reqVO = randomPojo(MemberGroupUpdateReqVO.class, o -> {
  67 + o.setId(dbGroup.getId()); // 设置更新的 ID
  68 + });
  69 +
  70 + // 调用
  71 + groupService.updateGroup(reqVO);
  72 + // 校验是否更新正确
  73 + MemberGroupDO group = groupMapper.selectById(reqVO.getId()); // 获取最新的
  74 + assertPojoEquals(reqVO, group);
  75 + }
  76 +
  77 + @Test
  78 + public void testUpdateGroup_notExists() {
  79 + // 准备参数
  80 + MemberGroupUpdateReqVO reqVO = randomPojo(MemberGroupUpdateReqVO.class);
  81 +
  82 + // 调用, 并断言异常
  83 + assertServiceException(() -> groupService.updateGroup(reqVO), GROUP_NOT_EXISTS);
  84 + }
  85 +
  86 + @Test
  87 + public void testDeleteGroup_success() {
  88 + // mock 数据
  89 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class);
  90 + groupMapper.insert(dbGroup);// @Sql: 先插入出一条存在的数据
  91 + // 准备参数
  92 + Long id = dbGroup.getId();
  93 +
  94 + // 调用
  95 + groupService.deleteGroup(id);
  96 + // 校验数据不存在了
  97 + assertNull(groupMapper.selectById(id));
  98 + }
  99 +
  100 + @Test
  101 + public void testDeleteGroup_notExists() {
  102 + // 准备参数
  103 + Long id = randomLongId();
  104 +
  105 + // 调用, 并断言异常
  106 + assertServiceException(() -> groupService.deleteGroup(id), GROUP_NOT_EXISTS);
  107 + }
  108 +
  109 + @Test
  110 + public void testDeleteGroup_hasUser() {
  111 + // mock 数据
  112 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class);
  113 + groupMapper.insert(dbGroup);// @Sql: 先插入出一条存在的数据
  114 + // 准备参数
  115 + Long id = dbGroup.getId();
  116 +
  117 + // mock 会员数据
  118 + MemberUserDO dbUser = randomPojo(MemberUserDO.class, o -> {
  119 + o.setGroupId(id);
  120 + o.setSex(RandomUtil.randomEle(SexEnum.values()).getSex());
  121 + });
  122 + memberUserMapper.insert(dbUser);
  123 +
  124 + // 调用, 并断言异常
  125 + assertServiceException(() -> groupService.deleteGroup(id), GROUP_HAS_USER);
  126 + }
  127 +
  128 + @Test
  129 + public void testGetGroupPage() {
  130 + String name = randomString();
  131 + int status = CommonStatusEnum.ENABLE.getStatus();
  132 +
  133 + // mock 数据
  134 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class, o -> { // 等会查询到
  135 + o.setName(name);
  136 + o.setStatus(status);
  137 + o.setCreateTime(buildTime(2023, 2, 18));
  138 + });
  139 + groupMapper.insert(dbGroup);
  140 + // 测试 name 不匹配
  141 + groupMapper.insert(cloneIgnoreId(dbGroup, o -> o.setName("")));
  142 + // 测试 status 不匹配
  143 + groupMapper.insert(cloneIgnoreId(dbGroup, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
  144 + // 测试 createTime 不匹配
  145 + groupMapper.insert(cloneIgnoreId(dbGroup, o -> o.setCreateTime(null)));
  146 + // 准备参数
  147 + MemberGroupPageReqVO reqVO = new MemberGroupPageReqVO();
  148 + reqVO.setName(name);
  149 + reqVO.setStatus(status);
  150 + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
  151 +
  152 + // 调用
  153 + PageResult<MemberGroupDO> pageResult = groupService.getGroupPage(reqVO);
  154 + // 断言
  155 + assertEquals(1, pageResult.getTotal());
  156 + assertEquals(1, pageResult.getList().size());
  157 + assertPojoEquals(dbGroup, pageResult.getList().get(0));
  158 + }
  159 +
  160 +}
... ...
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/clean.sql
  View file @8ae3401
1 1 DELETE FROM "member_user";
2 2 DELETE FROM "member_address";
3 3 DELETE FROM "member_tag";
4   -DELETE FROM "member_level";
5 4 \ No newline at end of file
  5 +DELETE FROM "member_level";
  6 +DELETE FROM "member_group";
6 7 \ No newline at end of file
... ...
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
  View file @8ae3401
1   -CREATE TABLE IF NOT EXISTS "member_user" (
2   - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY COMMENT '编号',
3   - "nickname" varchar(30) NOT NULL DEFAULT '' COMMENT '用户昵称',
4   - "avatar" varchar(255) NOT NULL DEFAULT '' COMMENT '头像',
5   - "status" tinyint NOT NULL COMMENT '状态',
6   - "mobile" varchar(11) NOT NULL COMMENT '手机号',
7   - "password" varchar(100) NOT NULL DEFAULT '' COMMENT '密码',
  1 +CREATE TABLE IF NOT EXISTS "member_user"
  2 +(
  3 + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY COMMENT '编号',
  4 + "nickname" varchar(30) NOT NULL DEFAULT '' COMMENT '用户昵称',
  5 + "name" varchar(30) NULL COMMENT '真实名字',
  6 + sex tinyint null comment '性别',
  7 + birthday datetime null comment '出生日期',
  8 + area_id int null comment '所在地',
  9 + mark varchar(255) null comment '用户备注',
  10 + point int default 0 null comment '积分',
  11 + "avatar" varchar(255) NOT NULL DEFAULT '' COMMENT '头像',
  12 + "status" tinyint NOT NULL COMMENT '状态',
  13 + "mobile" varchar(11) NOT NULL COMMENT '手机号',
  14 + "password" varchar(100) NOT NULL DEFAULT '' COMMENT '密码',
8 15 "register_ip" varchar(32) NOT NULL COMMENT '注册 IP',
9   - "login_ip" varchar(50) NULL DEFAULT '' COMMENT '最后登录IP',
10   - "login_date" datetime NULL DEFAULT NULL COMMENT '最后登录时间',
11   - "creator" varchar(64) NULL DEFAULT '' COMMENT '创建者',
12   - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
13   - "updater" varchar(64) NULL DEFAULT '' COMMENT '更新者',
14   - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
15   - "deleted" bit(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
16   - "tenant_id" bigint not null default '0',
  16 + "login_ip" varchar(50) NULL DEFAULT '' COMMENT '最后登录IP',
  17 + "login_date" datetime NULL DEFAULT NULL COMMENT '最后登录时间',
  18 + "tag_ids" varchar(255) NULL DEFAULT NULL COMMENT '用户标签编号列表,以逗号分隔',
  19 + "level_id" bigint NULL DEFAULT NULL COMMENT '等级编号',
  20 + "experience" bigint NULL DEFAULT NULL COMMENT '经验',
  21 + "group_id" bigint NULL DEFAULT NULL COMMENT '用户分组编号',
  22 + "creator" varchar(64) NULL DEFAULT '' COMMENT '创建者',
  23 + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  24 + "updater" varchar(64) NULL DEFAULT '' COMMENT '更新者',
  25 + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  26 + "deleted" bit(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
  27 + "tenant_id" bigint not null default '0',
17 28 PRIMARY KEY ("id")
18 29 ) COMMENT '会员表';
19 30  
... ... @@ -63,4 +74,19 @@ CREATE TABLE IF NOT EXISTS &quot;member_level&quot;
63 74 "tenant_id" bigint not null default '0',
64 75 "status" int NOT NULL,
65 76 PRIMARY KEY ("id")
66   -) COMMENT '会员等级';
67 77 \ No newline at end of file
  78 +) COMMENT '会员等级';
  79 +
  80 +CREATE TABLE IF NOT EXISTS "member_group"
  81 +(
  82 + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
  83 + "name" varchar NOT NULL,
  84 + "remark" varchar NOT NULL,
  85 + "status" varchar NOT NULL,
  86 + "creator" varchar DEFAULT '',
  87 + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
  88 + "updater" varchar DEFAULT '',
  89 + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  90 + "deleted" bit NOT NULL DEFAULT FALSE,
  91 + "tenant_id" bigint not null default '0',
  92 + PRIMARY KEY ("id")
  93 +) COMMENT '用户分组';
68 94 \ No newline at end of file
... ...