Commit 8191d9e1414c416274f5d3d4aec856cb09555793
Merge branch 'member_dev' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
Conflicts: yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
Showing
25 changed files
with
848 additions
and
16 deletions
sql/mysql/member_tag.sql
0 → 100644
| 1 | +create table member_tag | ||
| 2 | +( | ||
| 3 | + id bigint auto_increment comment '编号' | ||
| 4 | + primary key, | ||
| 5 | + name varchar(30) default '' not null comment '标签名称', | ||
| 6 | + creator varchar(64) default '' null comment '创建者', | ||
| 7 | + create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间', | ||
| 8 | + updater varchar(64) default '' null comment '更新者', | ||
| 9 | + update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间', | ||
| 10 | + deleted bit default b'0' not null comment '是否删除', | ||
| 11 | + tenant_id bigint default 0 not null comment '租户编号' | ||
| 12 | +) | ||
| 13 | + comment '会员标签'; | ||
| 14 | + | ||
| 15 | +alter table member_user add column tag_ids varchar(255) null comment '用户标签编号列表,以逗号分隔'; | ||
| 16 | + | ||
| 17 | +-- 菜单 SQL | ||
| 18 | +INSERT INTO system_menu( | ||
| 19 | + name, permission, type, sort, parent_id, | ||
| 20 | + path, icon, component, status, component_name | ||
| 21 | +) | ||
| 22 | +VALUES ( | ||
| 23 | + '会员标签管理', '', 2, 3, 2262, | ||
| 24 | + 'tag', '', 'member/tag/index', 0, 'MemberTag' | ||
| 25 | +); | ||
| 26 | + | ||
| 27 | +-- 按钮父菜单ID | ||
| 28 | +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话,需要手动修改 @parentId 的部分的代码 | ||
| 29 | +SELECT @parentId := LAST_INSERT_ID(); | ||
| 30 | + | ||
| 31 | +-- 按钮 SQL | ||
| 32 | +INSERT INTO system_menu( | ||
| 33 | + name, permission, type, sort, parent_id, | ||
| 34 | + path, icon, component, status | ||
| 35 | +) | ||
| 36 | +VALUES ( | ||
| 37 | + '会员标签查询', 'member:tag:query', 3, 1, @parentId, | ||
| 38 | + '', '', '', 0 | ||
| 39 | +); | ||
| 40 | +INSERT INTO system_menu( | ||
| 41 | + name, permission, type, sort, parent_id, | ||
| 42 | + path, icon, component, status | ||
| 43 | +) | ||
| 44 | +VALUES ( | ||
| 45 | + '会员标签创建', 'member:tag:create', 3, 2, @parentId, | ||
| 46 | + '', '', '', 0 | ||
| 47 | +); | ||
| 48 | +INSERT INTO system_menu( | ||
| 49 | + name, permission, type, sort, parent_id, | ||
| 50 | + path, icon, component, status | ||
| 51 | +) | ||
| 52 | +VALUES ( | ||
| 53 | + '会员标签更新', 'member:tag:update', 3, 3, @parentId, | ||
| 54 | + '', '', '', 0 | ||
| 55 | +); | ||
| 56 | +INSERT INTO system_menu( | ||
| 57 | + name, permission, type, sort, parent_id, | ||
| 58 | + path, icon, component, status | ||
| 59 | +) | ||
| 60 | +VALUES ( | ||
| 61 | + '会员标签删除', 'member:tag:delete', 3, 4, @parentId, | ||
| 62 | + '', '', '', 0 | ||
| 63 | +); | ||
| 64 | +INSERT INTO system_menu( | ||
| 65 | + name, permission, type, sort, parent_id, | ||
| 66 | + path, icon, component, status | ||
| 67 | +) | ||
| 68 | +VALUES ( | ||
| 69 | + '会员标签导出', 'member:tag:export', 3, 5, @parentId, | ||
| 70 | + '', '', '', 0 | ||
| 71 | +); |
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
| @@ -36,4 +36,9 @@ public interface ErrorCodeConstants { | @@ -36,4 +36,9 @@ public interface ErrorCodeConstants { | ||
| 36 | 36 | ||
| 37 | ErrorCode SIGN_IN_RECORD_NOT_EXISTS = new ErrorCode(1004005006, "用户签到积分不存在"); | 37 | ErrorCode SIGN_IN_RECORD_NOT_EXISTS = new ErrorCode(1004005006, "用户签到积分不存在"); |
| 38 | 38 | ||
| 39 | + | ||
| 40 | + //========== 会员标签 1004006000 ========== | ||
| 41 | + ErrorCode TAG_NOT_EXISTS = new ErrorCode(1004006000, "会员标签不存在"); | ||
| 42 | + ErrorCode TAG_NAME_EXISTS = new ErrorCode(1004006001, "会员标签已经存在"); | ||
| 43 | + | ||
| 39 | } | 44 | } |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/MemberTagController.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.tag; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | ||
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 5 | +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; | ||
| 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | ||
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.*; | ||
| 8 | +import cn.iocoder.yudao.module.member.convert.tag.MemberTagConvert; | ||
| 9 | +import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; | ||
| 10 | +import cn.iocoder.yudao.module.member.service.tag.MemberTagService; | ||
| 11 | +import io.swagger.v3.oas.annotations.Operation; | ||
| 12 | +import io.swagger.v3.oas.annotations.Parameter; | ||
| 13 | +import io.swagger.v3.oas.annotations.tags.Tag; | ||
| 14 | +import org.springframework.security.access.prepost.PreAuthorize; | ||
| 15 | +import org.springframework.validation.annotation.Validated; | ||
| 16 | +import org.springframework.web.bind.annotation.*; | ||
| 17 | + | ||
| 18 | +import javax.annotation.Resource; | ||
| 19 | +import javax.servlet.http.HttpServletResponse; | ||
| 20 | +import javax.validation.Valid; | ||
| 21 | +import java.io.IOException; | ||
| 22 | +import java.util.Collection; | ||
| 23 | +import java.util.List; | ||
| 24 | + | ||
| 25 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | ||
| 26 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | ||
| 27 | + | ||
| 28 | +@Tag(name = "管理后台 - 会员标签") | ||
| 29 | +@RestController | ||
| 30 | +@RequestMapping("/member/tag") | ||
| 31 | +@Validated | ||
| 32 | +public class MemberTagController { | ||
| 33 | + | ||
| 34 | + @Resource | ||
| 35 | + private MemberTagService tagService; | ||
| 36 | + | ||
| 37 | + @PostMapping("/create") | ||
| 38 | + @Operation(summary = "创建会员标签") | ||
| 39 | + @PreAuthorize("@ss.hasPermission('member:tag:create')") | ||
| 40 | + public CommonResult<Long> createTag(@Valid @RequestBody MemberTagCreateReqVO createReqVO) { | ||
| 41 | + return success(tagService.createTag(createReqVO)); | ||
| 42 | + } | ||
| 43 | + | ||
| 44 | + @PutMapping("/update") | ||
| 45 | + @Operation(summary = "更新会员标签") | ||
| 46 | + @PreAuthorize("@ss.hasPermission('member:tag:update')") | ||
| 47 | + public CommonResult<Boolean> updateTag(@Valid @RequestBody MemberTagUpdateReqVO updateReqVO) { | ||
| 48 | + tagService.updateTag(updateReqVO); | ||
| 49 | + return success(true); | ||
| 50 | + } | ||
| 51 | + | ||
| 52 | + @DeleteMapping("/delete") | ||
| 53 | + @Operation(summary = "删除会员标签") | ||
| 54 | + @Parameter(name = "id", description = "编号", required = true) | ||
| 55 | + @PreAuthorize("@ss.hasPermission('member:tag:delete')") | ||
| 56 | + public CommonResult<Boolean> deleteTag(@RequestParam("id") Long id) { | ||
| 57 | + tagService.deleteTag(id); | ||
| 58 | + return success(true); | ||
| 59 | + } | ||
| 60 | + | ||
| 61 | + @GetMapping("/get") | ||
| 62 | + @Operation(summary = "获得会员标签") | ||
| 63 | + @Parameter(name = "id", description = "编号", required = true, example = "1024") | ||
| 64 | + @PreAuthorize("@ss.hasPermission('member:tag:query')") | ||
| 65 | + public CommonResult<MemberTagRespVO> getMemberTag(@RequestParam("id") Long id) { | ||
| 66 | + MemberTagDO tag = tagService.getTag(id); | ||
| 67 | + return success(MemberTagConvert.INSTANCE.convert(tag)); | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + @GetMapping("/list") | ||
| 71 | + @Operation(summary = "获得会员标签列表") | ||
| 72 | + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") | ||
| 73 | + @PreAuthorize("@ss.hasPermission('member:tag:query')") | ||
| 74 | + public CommonResult<List<MemberTagRespVO>> getMemberTagList(@RequestParam("ids") Collection<Long> ids) { | ||
| 75 | + List<MemberTagDO> list = tagService.getTagList(ids); | ||
| 76 | + return success(MemberTagConvert.INSTANCE.convertList(list)); | ||
| 77 | + } | ||
| 78 | + | ||
| 79 | + @GetMapping("/page") | ||
| 80 | + @Operation(summary = "获得会员标签分页") | ||
| 81 | + @PreAuthorize("@ss.hasPermission('member:tag:query')") | ||
| 82 | + public CommonResult<PageResult<MemberTagRespVO>> getTagPage(@Valid MemberTagPageReqVO pageVO) { | ||
| 83 | + PageResult<MemberTagDO> pageResult = tagService.getTagPage(pageVO); | ||
| 84 | + return success(MemberTagConvert.INSTANCE.convertPage(pageResult)); | ||
| 85 | + } | ||
| 86 | + | ||
| 87 | + @GetMapping("/export-excel") | ||
| 88 | + @Operation(summary = "导出会员标签 Excel") | ||
| 89 | + @PreAuthorize("@ss.hasPermission('member:tag:export')") | ||
| 90 | + @OperateLog(type = EXPORT) | ||
| 91 | + public void exportTagExcel(@Valid MemberTagExportReqVO exportReqVO, | ||
| 92 | + HttpServletResponse response) throws IOException { | ||
| 93 | + List<MemberTagDO> list = tagService.getTagList(exportReqVO); | ||
| 94 | + // 导出 Excel | ||
| 95 | + List<MemberTagExcelVO> datas = MemberTagConvert.INSTANCE.convertList02(list); | ||
| 96 | + ExcelUtils.write(response, "会员标签.xls", "数据", MemberTagExcelVO.class, datas); | ||
| 97 | + } | ||
| 98 | + | ||
| 99 | +} |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagBaseVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.tag.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 MemberTagBaseVO { | ||
| 14 | + | ||
| 15 | + @Schema(description = "标签名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") | ||
| 16 | + @NotNull(message = "标签名称不能为空") | ||
| 17 | + private String name; | ||
| 18 | + | ||
| 19 | +} |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagCreateReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.tag.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 MemberTagCreateReqVO extends MemberTagBaseVO { | ||
| 13 | + | ||
| 14 | +} |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagExcelVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.tag.vo; | ||
| 2 | + | ||
| 3 | +import com.alibaba.excel.annotation.ExcelProperty; | ||
| 4 | +import lombok.Data; | ||
| 5 | + | ||
| 6 | +import java.time.LocalDateTime; | ||
| 7 | + | ||
| 8 | +/** | ||
| 9 | + * 会员标签 Excel VO | ||
| 10 | + * | ||
| 11 | + * @author 芋道源码 | ||
| 12 | + */ | ||
| 13 | +@Data | ||
| 14 | +public class MemberTagExcelVO { | ||
| 15 | + | ||
| 16 | + @ExcelProperty("编号") | ||
| 17 | + private Long id; | ||
| 18 | + | ||
| 19 | + @ExcelProperty("标签名称") | ||
| 20 | + private String name; | ||
| 21 | + | ||
| 22 | + @ExcelProperty("创建时间") | ||
| 23 | + private LocalDateTime createTime; | ||
| 24 | + | ||
| 25 | +} |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagExportReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.tag.vo; | ||
| 2 | + | ||
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | ||
| 4 | +import lombok.Data; | ||
| 5 | +import org.springframework.format.annotation.DateTimeFormat; | ||
| 6 | + | ||
| 7 | +import java.time.LocalDateTime; | ||
| 8 | + | ||
| 9 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | ||
| 10 | + | ||
| 11 | +@Schema(description = "管理后台 - 会员标签 Excel 导出 Request VO,参数和 MemberTagPageReqVO 是一致的") | ||
| 12 | +@Data | ||
| 13 | +public class MemberTagExportReqVO { | ||
| 14 | + | ||
| 15 | + @Schema(description = "标签名称", example = "李四") | ||
| 16 | + private String name; | ||
| 17 | + | ||
| 18 | + @Schema(description = "创建时间") | ||
| 19 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | ||
| 20 | + private LocalDateTime[] createTime; | ||
| 21 | + | ||
| 22 | +} |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagPageReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.tag.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 MemberTagPageReqVO extends PageParam { | ||
| 19 | + | ||
| 20 | + @Schema(description = "标签名称", example = "李四") | ||
| 21 | + private String name; | ||
| 22 | + | ||
| 23 | + @Schema(description = "创建时间") | ||
| 24 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | ||
| 25 | + private LocalDateTime[] createTime; | ||
| 26 | + | ||
| 27 | +} |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagRespVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.tag.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 MemberTagRespVO extends MemberTagBaseVO { | ||
| 15 | + | ||
| 16 | + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "907") | ||
| 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/tag/vo/MemberTagUpdateReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.tag.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 MemberTagUpdateReqVO extends MemberTagBaseVO { | ||
| 15 | + | ||
| 16 | + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "907") | ||
| 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/user/MemberUserController.java
| 1 | package cn.iocoder.yudao.module.member.controller.admin.user; | 1 | package cn.iocoder.yudao.module.member.controller.admin.user; |
| 2 | 2 | ||
| 3 | -import org.springframework.web.bind.annotation.*; | ||
| 4 | -import javax.annotation.Resource; | ||
| 5 | -import org.springframework.validation.annotation.Validated; | ||
| 6 | -import org.springframework.security.access.prepost.PreAuthorize; | ||
| 7 | -import io.swagger.v3.oas.annotations.tags.Tag; | ||
| 8 | -import io.swagger.v3.oas.annotations.Parameter; | 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.user.vo.MemberUserPageReqVO; | ||
| 6 | +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO; | ||
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; | ||
| 8 | +import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; | ||
| 9 | +import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; | ||
| 10 | +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | ||
| 11 | +import cn.iocoder.yudao.module.member.service.tag.MemberTagService; | ||
| 12 | +import cn.iocoder.yudao.module.member.service.user.MemberUserService; | ||
| 9 | import io.swagger.v3.oas.annotations.Operation; | 13 | import io.swagger.v3.oas.annotations.Operation; |
| 14 | +import io.swagger.v3.oas.annotations.Parameter; | ||
| 15 | +import io.swagger.v3.oas.annotations.tags.Tag; | ||
| 16 | +import org.springframework.security.access.prepost.PreAuthorize; | ||
| 17 | +import org.springframework.validation.annotation.Validated; | ||
| 18 | +import org.springframework.web.bind.annotation.*; | ||
| 10 | 19 | ||
| 11 | -import javax.validation.*; | 20 | +import javax.annotation.Resource; |
| 21 | +import javax.validation.Valid; | ||
| 22 | +import java.util.*; | ||
| 23 | +import java.util.stream.Collectors; | ||
| 12 | 24 | ||
| 13 | -import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 14 | -import cn.iocoder.yudao.framework.common.pojo.CommonResult; | ||
| 15 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 25 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 16 | - | ||
| 17 | -import cn.iocoder.yudao.module.member.controller.admin.user.vo.*; | ||
| 18 | -import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | ||
| 19 | -import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; | ||
| 20 | -import cn.iocoder.yudao.module.member.service.user.MemberUserService; | 26 | +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; |
| 21 | 27 | ||
| 22 | @Tag(name = "管理后台 - 会员用户") | 28 | @Tag(name = "管理后台 - 会员用户") |
| 23 | @RestController | 29 | @RestController |
| @@ -27,6 +33,8 @@ public class MemberUserController { | @@ -27,6 +33,8 @@ public class MemberUserController { | ||
| 27 | 33 | ||
| 28 | @Resource | 34 | @Resource |
| 29 | private MemberUserService memberUserService; | 35 | private MemberUserService memberUserService; |
| 36 | + @Resource | ||
| 37 | + private MemberTagService memberTagService; | ||
| 30 | 38 | ||
| 31 | @PutMapping("/update") | 39 | @PutMapping("/update") |
| 32 | @Operation(summary = "更新会员用户") | 40 | @Operation(summary = "更新会员用户") |
| @@ -50,7 +58,17 @@ public class MemberUserController { | @@ -50,7 +58,17 @@ public class MemberUserController { | ||
| 50 | @PreAuthorize("@ss.hasPermission('member:user:query')") | 58 | @PreAuthorize("@ss.hasPermission('member:user:query')") |
| 51 | public CommonResult<PageResult<MemberUserRespVO>> getUserPage(@Valid MemberUserPageReqVO pageVO) { | 59 | public CommonResult<PageResult<MemberUserRespVO>> getUserPage(@Valid MemberUserPageReqVO pageVO) { |
| 52 | PageResult<MemberUserDO> pageResult = memberUserService.getUserPage(pageVO); | 60 | PageResult<MemberUserDO> pageResult = memberUserService.getUserPage(pageVO); |
| 53 | - return success(MemberUserConvert.INSTANCE.convertPage(pageResult)); | 61 | + |
| 62 | + // 处理会员标签返显 | ||
| 63 | + Set<Long> tagIds = pageResult.getList().stream() | ||
| 64 | + .map(MemberUserDO::getTagIds) | ||
| 65 | + .filter(Objects::nonNull) | ||
| 66 | + .flatMap(Collection::stream) | ||
| 67 | + .collect(Collectors.toSet()); | ||
| 68 | + List<MemberTagDO> tags = memberTagService.getTagList(tagIds); | ||
| 69 | + Map<Long, String> tagNameMap = convertMap(tags, MemberTagDO::getId, MemberTagDO::getName); | ||
| 70 | + | ||
| 71 | + return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tagNameMap)); | ||
| 54 | } | 72 | } |
| 55 | 73 | ||
| 56 | } | 74 | } |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
| @@ -7,6 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; | @@ -7,6 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; | ||
| 7 | 7 | ||
| 8 | import javax.validation.constraints.NotNull; | 8 | import javax.validation.constraints.NotNull; |
| 9 | import java.time.LocalDateTime; | 9 | import java.time.LocalDateTime; |
| 10 | +import java.util.List; | ||
| 10 | 11 | ||
| 11 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; | 12 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; |
| 12 | 13 | ||
| @@ -49,4 +50,7 @@ public class MemberUserBaseVO { | @@ -49,4 +50,7 @@ public class MemberUserBaseVO { | ||
| 49 | @Schema(description = "会员备注", example = "我是小备注") | 50 | @Schema(description = "会员备注", example = "我是小备注") |
| 50 | private String mark; | 51 | private String mark; |
| 51 | 52 | ||
| 53 | + @Schema(description = "会员标签") | ||
| 54 | + private List<Long> tagIds; | ||
| 55 | + | ||
| 52 | } | 56 | } |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java
| @@ -8,6 +8,7 @@ import lombok.ToString; | @@ -8,6 +8,7 @@ import lombok.ToString; | ||
| 8 | import org.springframework.format.annotation.DateTimeFormat; | 8 | import org.springframework.format.annotation.DateTimeFormat; |
| 9 | 9 | ||
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
| 11 | +import java.util.List; | ||
| 11 | 12 | ||
| 12 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | 13 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| 13 | 14 | ||
| @@ -31,4 +32,7 @@ public class MemberUserPageReqVO extends PageParam { | @@ -31,4 +32,7 @@ public class MemberUserPageReqVO extends PageParam { | ||
| 31 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | 32 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| 32 | private LocalDateTime[] createTime; | 33 | private LocalDateTime[] createTime; |
| 33 | 34 | ||
| 35 | + @Schema(description = "会员标签") | ||
| 36 | + private List<Long> tagIds; | ||
| 37 | + | ||
| 34 | } | 38 | } |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java
| @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; | @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; | ||
| 6 | import lombok.ToString; | 6 | import lombok.ToString; |
| 7 | 7 | ||
| 8 | import java.time.LocalDateTime; | 8 | import java.time.LocalDateTime; |
| 9 | +import java.util.List; | ||
| 9 | 10 | ||
| 10 | @Schema(description = "管理后台 - 会员用户 Response VO") | 11 | @Schema(description = "管理后台 - 会员用户 Response VO") |
| 11 | @Data | 12 | @Data |
| @@ -28,4 +29,9 @@ public class MemberUserRespVO extends MemberUserBaseVO { | @@ -28,4 +29,9 @@ public class MemberUserRespVO extends MemberUserBaseVO { | ||
| 28 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 29 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
| 29 | private LocalDateTime createTime; | 30 | private LocalDateTime createTime; |
| 30 | 31 | ||
| 32 | + | ||
| 33 | + // ========== 其它信息 ========== | ||
| 34 | + | ||
| 35 | + @Schema(description = "会员标签") | ||
| 36 | + private List<String> tagNames; | ||
| 31 | } | 37 | } |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/tag/MemberTagConvert.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.convert.tag; | ||
| 2 | + | ||
| 3 | +import java.util.*; | ||
| 4 | + | ||
| 5 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 6 | + | ||
| 7 | +import org.mapstruct.Mapper; | ||
| 8 | +import org.mapstruct.factory.Mappers; | ||
| 9 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.*; | ||
| 10 | +import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; | ||
| 11 | + | ||
| 12 | +/** | ||
| 13 | + * 会员标签 Convert | ||
| 14 | + * | ||
| 15 | + * @author 芋道源码 | ||
| 16 | + */ | ||
| 17 | +@Mapper | ||
| 18 | +public interface MemberTagConvert { | ||
| 19 | + | ||
| 20 | + MemberTagConvert INSTANCE = Mappers.getMapper(MemberTagConvert.class); | ||
| 21 | + | ||
| 22 | + MemberTagDO convert(MemberTagCreateReqVO bean); | ||
| 23 | + | ||
| 24 | + MemberTagDO convert(MemberTagUpdateReqVO bean); | ||
| 25 | + | ||
| 26 | + MemberTagRespVO convert(MemberTagDO bean); | ||
| 27 | + | ||
| 28 | + List<MemberTagRespVO> convertList(List<MemberTagDO> list); | ||
| 29 | + | ||
| 30 | + PageResult<MemberTagRespVO> convertPage(PageResult<MemberTagDO> page); | ||
| 31 | + | ||
| 32 | + List<MemberTagExcelVO> convertList02(List<MemberTagDO> list); | ||
| 33 | + | ||
| 34 | +} |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
| @@ -10,6 +10,9 @@ import org.mapstruct.Mapper; | @@ -10,6 +10,9 @@ import org.mapstruct.Mapper; | ||
| 10 | import org.mapstruct.factory.Mappers; | 10 | import org.mapstruct.factory.Mappers; |
| 11 | 11 | ||
| 12 | import java.util.List; | 12 | import java.util.List; |
| 13 | +import java.util.Map; | ||
| 14 | + | ||
| 15 | +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; | ||
| 13 | 16 | ||
| 14 | @Mapper | 17 | @Mapper |
| 15 | public interface MemberUserConvert { | 18 | public interface MemberUserConvert { |
| @@ -28,4 +31,12 @@ public interface MemberUserConvert { | @@ -28,4 +31,12 @@ public interface MemberUserConvert { | ||
| 28 | 31 | ||
| 29 | MemberUserRespVO convert03(MemberUserDO bean); | 32 | MemberUserRespVO convert03(MemberUserDO bean); |
| 30 | 33 | ||
| 34 | + default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult, | ||
| 35 | + Map<Long, String> tagMap) { | ||
| 36 | + PageResult<MemberUserRespVO> result = convertPage(pageResult); | ||
| 37 | + for (MemberUserRespVO vo : result.getList()) { | ||
| 38 | + vo.setTagNames(convertList(vo.getTagIds(), tagMap::get)); | ||
| 39 | + } | ||
| 40 | + return result; | ||
| 41 | + } | ||
| 31 | } | 42 | } |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/tag/MemberTagDO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.dal.dataobject.tag; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | ||
| 4 | +import com.baomidou.mybatisplus.annotation.KeySequence; | ||
| 5 | +import com.baomidou.mybatisplus.annotation.TableId; | ||
| 6 | +import com.baomidou.mybatisplus.annotation.TableName; | ||
| 7 | +import lombok.*; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * 会员标签 DO | ||
| 11 | + * | ||
| 12 | + * @author 芋道源码 | ||
| 13 | + */ | ||
| 14 | +@TableName("member_tag") | ||
| 15 | +@KeySequence("member_tag_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | ||
| 16 | +@Data | ||
| 17 | +@EqualsAndHashCode(callSuper = true) | ||
| 18 | +@ToString(callSuper = true) | ||
| 19 | +@Builder | ||
| 20 | +@NoArgsConstructor | ||
| 21 | +@AllArgsConstructor | ||
| 22 | +public class MemberTagDO extends BaseDO { | ||
| 23 | + | ||
| 24 | + /** | ||
| 25 | + * 编号 | ||
| 26 | + */ | ||
| 27 | + @TableId | ||
| 28 | + private Long id; | ||
| 29 | + /** | ||
| 30 | + * 标签名称 | ||
| 31 | + */ | ||
| 32 | + private String name; | ||
| 33 | + | ||
| 34 | +} |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
| @@ -2,15 +2,18 @@ package cn.iocoder.yudao.module.member.dal.dataobject.user; | @@ -2,15 +2,18 @@ package cn.iocoder.yudao.module.member.dal.dataobject.user; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | import cn.iocoder.yudao.framework.ip.core.Area; | 4 | import cn.iocoder.yudao.framework.ip.core.Area; |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler; | ||
| 5 | import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; | 6 | import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; |
| 6 | import cn.iocoder.yudao.module.system.enums.common.SexEnum; | 7 | import cn.iocoder.yudao.module.system.enums.common.SexEnum; |
| 7 | import com.baomidou.mybatisplus.annotation.KeySequence; | 8 | import com.baomidou.mybatisplus.annotation.KeySequence; |
| 9 | +import com.baomidou.mybatisplus.annotation.TableField; | ||
| 8 | import com.baomidou.mybatisplus.annotation.TableId; | 10 | import com.baomidou.mybatisplus.annotation.TableId; |
| 9 | import com.baomidou.mybatisplus.annotation.TableName; | 11 | import com.baomidou.mybatisplus.annotation.TableName; |
| 10 | import lombok.*; | 12 | import lombok.*; |
| 11 | import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; | 13 | import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; |
| 12 | 14 | ||
| 13 | import java.time.LocalDateTime; | 15 | import java.time.LocalDateTime; |
| 16 | +import java.util.List; | ||
| 14 | 17 | ||
| 15 | /** | 18 | /** |
| 16 | * 会员用户 DO | 19 | * 会员用户 DO |
| @@ -107,6 +110,11 @@ public class MemberUserDO extends TenantBaseDO { | @@ -107,6 +110,11 @@ public class MemberUserDO extends TenantBaseDO { | ||
| 107 | */ | 110 | */ |
| 108 | private Integer point; | 111 | private Integer point; |
| 109 | 112 | ||
| 110 | - // TODO 积分、成长值、会员等级等等 | 113 | + /** |
| 114 | + * 会员标签列表,以逗号分隔 | ||
| 115 | + */ | ||
| 116 | + @TableField(typeHandler = LongListTypeHandler.class) | ||
| 117 | + private List<Long> tagIds; | ||
| 111 | 118 | ||
| 119 | + // TODO 成长值、会员等级等等 | ||
| 112 | } | 120 | } |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/tag/MemberTagMapper.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.dal.mysql.tag; | ||
| 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.tag.vo.MemberTagExportReqVO; | ||
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagPageReqVO; | ||
| 8 | +import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; | ||
| 9 | +import org.apache.ibatis.annotations.Mapper; | ||
| 10 | + | ||
| 11 | +import java.util.List; | ||
| 12 | + | ||
| 13 | +/** | ||
| 14 | + * 会员标签 Mapper | ||
| 15 | + * | ||
| 16 | + * @author 芋道源码 | ||
| 17 | + */ | ||
| 18 | +@Mapper | ||
| 19 | +public interface MemberTagMapper extends BaseMapperX<MemberTagDO> { | ||
| 20 | + | ||
| 21 | + default PageResult<MemberTagDO> selectPage(MemberTagPageReqVO reqVO) { | ||
| 22 | + return selectPage(reqVO, new LambdaQueryWrapperX<MemberTagDO>() | ||
| 23 | + .likeIfPresent(MemberTagDO::getName, reqVO.getName()) | ||
| 24 | + .betweenIfPresent(MemberTagDO::getCreateTime, reqVO.getCreateTime()) | ||
| 25 | + .orderByDesc(MemberTagDO::getId)); | ||
| 26 | + } | ||
| 27 | + | ||
| 28 | + default List<MemberTagDO> selectList(MemberTagExportReqVO reqVO) { | ||
| 29 | + return selectList(new LambdaQueryWrapperX<MemberTagDO>() | ||
| 30 | + .likeIfPresent(MemberTagDO::getName, reqVO.getName()) | ||
| 31 | + .betweenIfPresent(MemberTagDO::getCreateTime, reqVO.getCreateTime()) | ||
| 32 | + .orderByDesc(MemberTagDO::getId)); | ||
| 33 | + } | ||
| 34 | + | ||
| 35 | + default boolean exists(Long id, String name) { | ||
| 36 | + return exists(new LambdaQueryWrapperX<MemberTagDO>() | ||
| 37 | + .neIfPresent(MemberTagDO::getId, id) | ||
| 38 | + .eq(MemberTagDO::getName, name)); | ||
| 39 | + } | ||
| 40 | +} |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
| 1 | package cn.iocoder.yudao.module.member.dal.mysql.user; | 1 | package cn.iocoder.yudao.module.member.dal.mysql.user; |
| 2 | 2 | ||
| 3 | +import cn.hutool.core.collection.CollUtil; | ||
| 4 | +import cn.hutool.core.util.StrUtil; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | 6 | import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; | 7 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
| @@ -8,6 +10,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | @@ -8,6 +10,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | ||
| 8 | import org.apache.ibatis.annotations.Mapper; | 10 | import org.apache.ibatis.annotations.Mapper; |
| 9 | 11 | ||
| 10 | import java.util.List; | 12 | import java.util.List; |
| 13 | +import java.util.stream.Collectors; | ||
| 11 | 14 | ||
| 12 | /** | 15 | /** |
| 13 | * 会员 User Mapper | 16 | * 会员 User Mapper |
| @@ -27,11 +30,19 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> { | @@ -27,11 +30,19 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> { | ||
| 27 | } | 30 | } |
| 28 | 31 | ||
| 29 | default PageResult<MemberUserDO> selectPage(MemberUserPageReqVO reqVO) { | 32 | default PageResult<MemberUserDO> selectPage(MemberUserPageReqVO reqVO) { |
| 33 | + String tagIdSql = ""; | ||
| 34 | + if (CollUtil.isNotEmpty(reqVO.getTagIds())) { | ||
| 35 | + tagIdSql = reqVO.getTagIds().stream() | ||
| 36 | + .map(tagId -> "FIND_IN_SET(" + tagId + ", tag_ids)") | ||
| 37 | + .collect(Collectors.joining(" OR ")); | ||
| 38 | + } | ||
| 39 | + | ||
| 30 | return selectPage(reqVO, new LambdaQueryWrapperX<MemberUserDO>() | 40 | return selectPage(reqVO, new LambdaQueryWrapperX<MemberUserDO>() |
| 31 | .likeIfPresent(MemberUserDO::getMobile, reqVO.getMobile()) | 41 | .likeIfPresent(MemberUserDO::getMobile, reqVO.getMobile()) |
| 32 | .betweenIfPresent(MemberUserDO::getLoginDate, reqVO.getLoginDate()) | 42 | .betweenIfPresent(MemberUserDO::getLoginDate, reqVO.getLoginDate()) |
| 33 | .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname()) | 43 | .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname()) |
| 34 | .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime()) | 44 | .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime()) |
| 45 | + .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql) | ||
| 35 | .orderByDesc(MemberUserDO::getId)); | 46 | .orderByDesc(MemberUserDO::getId)); |
| 36 | } | 47 | } |
| 37 | 48 |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagService.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.tag; | ||
| 2 | + | ||
| 3 | +import java.util.*; | ||
| 4 | +import javax.validation.*; | ||
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.*; | ||
| 6 | +import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; | ||
| 7 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * 会员标签 Service 接口 | ||
| 11 | + * | ||
| 12 | + * @author 芋道源码 | ||
| 13 | + */ | ||
| 14 | +public interface MemberTagService { | ||
| 15 | + | ||
| 16 | + /** | ||
| 17 | + * 创建会员标签 | ||
| 18 | + * | ||
| 19 | + * @param createReqVO 创建信息 | ||
| 20 | + * @return 编号 | ||
| 21 | + */ | ||
| 22 | + Long createTag(@Valid MemberTagCreateReqVO createReqVO); | ||
| 23 | + | ||
| 24 | + /** | ||
| 25 | + * 更新会员标签 | ||
| 26 | + * | ||
| 27 | + * @param updateReqVO 更新信息 | ||
| 28 | + */ | ||
| 29 | + void updateTag(@Valid MemberTagUpdateReqVO updateReqVO); | ||
| 30 | + | ||
| 31 | + /** | ||
| 32 | + * 删除会员标签 | ||
| 33 | + * | ||
| 34 | + * @param id 编号 | ||
| 35 | + */ | ||
| 36 | + void deleteTag(Long id); | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 获得会员标签 | ||
| 40 | + * | ||
| 41 | + * @param id 编号 | ||
| 42 | + * @return 会员标签 | ||
| 43 | + */ | ||
| 44 | + MemberTagDO getTag(Long id); | ||
| 45 | + | ||
| 46 | + /** | ||
| 47 | + * 获得会员标签列表 | ||
| 48 | + * | ||
| 49 | + * @param ids 编号 | ||
| 50 | + * @return 会员标签列表 | ||
| 51 | + */ | ||
| 52 | + List<MemberTagDO> getTagList(Collection<Long> ids); | ||
| 53 | + | ||
| 54 | + /** | ||
| 55 | + * 获得会员标签分页 | ||
| 56 | + * | ||
| 57 | + * @param pageReqVO 分页查询 | ||
| 58 | + * @return 会员标签分页 | ||
| 59 | + */ | ||
| 60 | + PageResult<MemberTagDO> getTagPage(MemberTagPageReqVO pageReqVO); | ||
| 61 | + | ||
| 62 | + /** | ||
| 63 | + * 获得会员标签列表, 用于 Excel 导出 | ||
| 64 | + * | ||
| 65 | + * @param exportReqVO 查询条件 | ||
| 66 | + * @return 会员标签列表 | ||
| 67 | + */ | ||
| 68 | + List<MemberTagDO> getTagList(MemberTagExportReqVO exportReqVO); | ||
| 69 | + | ||
| 70 | +} |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.tag; | ||
| 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.tag.vo.MemberTagCreateReqVO; | ||
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagExportReqVO; | ||
| 8 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagPageReqVO; | ||
| 9 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagUpdateReqVO; | ||
| 10 | +import cn.iocoder.yudao.module.member.convert.tag.MemberTagConvert; | ||
| 11 | +import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; | ||
| 12 | +import cn.iocoder.yudao.module.member.dal.mysql.tag.MemberTagMapper; | ||
| 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.TAG_NAME_EXISTS; | ||
| 22 | +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.TAG_NOT_EXISTS; | ||
| 23 | + | ||
| 24 | +/** | ||
| 25 | + * 会员标签 Service 实现类 | ||
| 26 | + * | ||
| 27 | + * @author 芋道源码 | ||
| 28 | + */ | ||
| 29 | +@Service | ||
| 30 | +@Validated | ||
| 31 | +public class MemberTagServiceImpl implements MemberTagService { | ||
| 32 | + | ||
| 33 | + @Resource | ||
| 34 | + private MemberTagMapper tagMapper; | ||
| 35 | + | ||
| 36 | + @Override | ||
| 37 | + public Long createTag(MemberTagCreateReqVO createReqVO) { | ||
| 38 | + // 校验名称唯一 | ||
| 39 | + validateTagNameUnique(null, createReqVO.getName()); | ||
| 40 | + // 插入 | ||
| 41 | + MemberTagDO tag = MemberTagConvert.INSTANCE.convert(createReqVO); | ||
| 42 | + tagMapper.insert(tag); | ||
| 43 | + // 返回 | ||
| 44 | + return tag.getId(); | ||
| 45 | + } | ||
| 46 | + | ||
| 47 | + @Override | ||
| 48 | + public void updateTag(MemberTagUpdateReqVO updateReqVO) { | ||
| 49 | + // 校验存在 | ||
| 50 | + validateTagExists(updateReqVO.getId()); | ||
| 51 | + // 校验名称唯一 | ||
| 52 | + validateTagNameUnique(updateReqVO.getId(), updateReqVO.getName()); | ||
| 53 | + // 更新 | ||
| 54 | + MemberTagDO updateObj = MemberTagConvert.INSTANCE.convert(updateReqVO); | ||
| 55 | + tagMapper.updateById(updateObj); | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + @Override | ||
| 59 | + public void deleteTag(Long id) { | ||
| 60 | + // 校验存在 | ||
| 61 | + validateTagExists(id); | ||
| 62 | + // 删除 | ||
| 63 | + tagMapper.deleteById(id); | ||
| 64 | + } | ||
| 65 | + | ||
| 66 | + private void validateTagExists(Long id) { | ||
| 67 | + if (tagMapper.selectById(id) == null) { | ||
| 68 | + throw exception(TAG_NOT_EXISTS); | ||
| 69 | + } | ||
| 70 | + } | ||
| 71 | + | ||
| 72 | + private void validateTagNameUnique(Long id, String name) { | ||
| 73 | + boolean exists = tagMapper.exists(id, name); | ||
| 74 | + if (exists) { | ||
| 75 | + throw exception(TAG_NAME_EXISTS); | ||
| 76 | + } | ||
| 77 | + } | ||
| 78 | + | ||
| 79 | + @Override | ||
| 80 | + public MemberTagDO getTag(Long id) { | ||
| 81 | + return tagMapper.selectById(id); | ||
| 82 | + } | ||
| 83 | + | ||
| 84 | + @Override | ||
| 85 | + public List<MemberTagDO> getTagList(Collection<Long> ids) { | ||
| 86 | + if (CollUtil.isEmpty(ids)) { | ||
| 87 | + return ListUtil.empty(); | ||
| 88 | + } | ||
| 89 | + return tagMapper.selectBatchIds(ids); | ||
| 90 | + } | ||
| 91 | + | ||
| 92 | + @Override | ||
| 93 | + public PageResult<MemberTagDO> getTagPage(MemberTagPageReqVO pageReqVO) { | ||
| 94 | + return tagMapper.selectPage(pageReqVO); | ||
| 95 | + } | ||
| 96 | + | ||
| 97 | + @Override | ||
| 98 | + public List<MemberTagDO> getTagList(MemberTagExportReqVO exportReqVO) { | ||
| 99 | + return tagMapper.selectList(exportReqVO); | ||
| 100 | + } | ||
| 101 | + | ||
| 102 | +} |
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImplTest.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.tag; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 4 | +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | ||
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagCreateReqVO; | ||
| 6 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagExportReqVO; | ||
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagPageReqVO; | ||
| 8 | +import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagUpdateReqVO; | ||
| 9 | +import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; | ||
| 10 | +import cn.iocoder.yudao.module.member.dal.mysql.tag.MemberTagMapper; | ||
| 11 | +import org.junit.jupiter.api.Test; | ||
| 12 | +import org.springframework.context.annotation.Import; | ||
| 13 | + | ||
| 14 | +import javax.annotation.Resource; | ||
| 15 | +import java.util.List; | ||
| 16 | + | ||
| 17 | +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; | ||
| 18 | +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; | ||
| 19 | +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; | ||
| 20 | +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; | ||
| 21 | +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; | ||
| 22 | +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; | ||
| 23 | +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; | ||
| 24 | +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.TAG_NOT_EXISTS; | ||
| 25 | +import static org.junit.jupiter.api.Assertions.*; | ||
| 26 | + | ||
| 27 | +/** | ||
| 28 | + * {@link MemberTagServiceImpl} 的单元测试类 | ||
| 29 | + * | ||
| 30 | + * @author 芋道源码 | ||
| 31 | + */ | ||
| 32 | +@Import(MemberTagServiceImpl.class) | ||
| 33 | +public class MemberTagServiceImplTest extends BaseDbUnitTest { | ||
| 34 | + | ||
| 35 | + @Resource | ||
| 36 | + private MemberTagServiceImpl tagService; | ||
| 37 | + | ||
| 38 | + @Resource | ||
| 39 | + private MemberTagMapper tagMapper; | ||
| 40 | + | ||
| 41 | + @Test | ||
| 42 | + public void testCreateTag_success() { | ||
| 43 | + // 准备参数 | ||
| 44 | + MemberTagCreateReqVO reqVO = randomPojo(MemberTagCreateReqVO.class); | ||
| 45 | + | ||
| 46 | + // 调用 | ||
| 47 | + Long tagId = tagService.createTag(reqVO); | ||
| 48 | + // 断言 | ||
| 49 | + assertNotNull(tagId); | ||
| 50 | + // 校验记录的属性是否正确 | ||
| 51 | + MemberTagDO tag = tagMapper.selectById(tagId); | ||
| 52 | + assertPojoEquals(reqVO, tag); | ||
| 53 | + } | ||
| 54 | + | ||
| 55 | + @Test | ||
| 56 | + public void testUpdateTag_success() { | ||
| 57 | + // mock 数据 | ||
| 58 | + MemberTagDO dbTag = randomPojo(MemberTagDO.class); | ||
| 59 | + tagMapper.insert(dbTag);// @Sql: 先插入出一条存在的数据 | ||
| 60 | + // 准备参数 | ||
| 61 | + MemberTagUpdateReqVO reqVO = randomPojo(MemberTagUpdateReqVO.class, o -> { | ||
| 62 | + o.setId(dbTag.getId()); // 设置更新的 ID | ||
| 63 | + }); | ||
| 64 | + | ||
| 65 | + // 调用 | ||
| 66 | + tagService.updateTag(reqVO); | ||
| 67 | + // 校验是否更新正确 | ||
| 68 | + MemberTagDO tag = tagMapper.selectById(reqVO.getId()); // 获取最新的 | ||
| 69 | + assertPojoEquals(reqVO, tag); | ||
| 70 | + } | ||
| 71 | + | ||
| 72 | + @Test | ||
| 73 | + public void testUpdateTag_notExists() { | ||
| 74 | + // 准备参数 | ||
| 75 | + MemberTagUpdateReqVO reqVO = randomPojo(MemberTagUpdateReqVO.class); | ||
| 76 | + | ||
| 77 | + // 调用, 并断言异常 | ||
| 78 | + assertServiceException(() -> tagService.updateTag(reqVO), TAG_NOT_EXISTS); | ||
| 79 | + } | ||
| 80 | + | ||
| 81 | + @Test | ||
| 82 | + public void testDeleteTag_success() { | ||
| 83 | + // mock 数据 | ||
| 84 | + MemberTagDO dbTag = randomPojo(MemberTagDO.class); | ||
| 85 | + tagMapper.insert(dbTag);// @Sql: 先插入出一条存在的数据 | ||
| 86 | + // 准备参数 | ||
| 87 | + Long id = dbTag.getId(); | ||
| 88 | + | ||
| 89 | + // 调用 | ||
| 90 | + tagService.deleteTag(id); | ||
| 91 | + // 校验数据不存在了 | ||
| 92 | + assertNull(tagMapper.selectById(id)); | ||
| 93 | + } | ||
| 94 | + | ||
| 95 | + @Test | ||
| 96 | + public void testDeleteTag_notExists() { | ||
| 97 | + // 准备参数 | ||
| 98 | + Long id = randomLongId(); | ||
| 99 | + | ||
| 100 | + // 调用, 并断言异常 | ||
| 101 | + assertServiceException(() -> tagService.deleteTag(id), TAG_NOT_EXISTS); | ||
| 102 | + } | ||
| 103 | + | ||
| 104 | + @Test | ||
| 105 | + public void testGetTagPage() { | ||
| 106 | + // mock 数据 | ||
| 107 | + MemberTagDO dbTag = randomPojo(MemberTagDO.class, o -> { // 等会查询到 | ||
| 108 | + o.setName("test"); | ||
| 109 | + o.setCreateTime(buildTime(2023, 2, 18)); | ||
| 110 | + }); | ||
| 111 | + tagMapper.insert(dbTag); | ||
| 112 | + // 测试 name 不匹配 | ||
| 113 | + tagMapper.insert(cloneIgnoreId(dbTag, o -> o.setName("ne"))); | ||
| 114 | + // 测试 createTime 不匹配 | ||
| 115 | + tagMapper.insert(cloneIgnoreId(dbTag, o -> o.setCreateTime(null))); | ||
| 116 | + // 准备参数 | ||
| 117 | + MemberTagPageReqVO reqVO = new MemberTagPageReqVO(); | ||
| 118 | + reqVO.setName("test"); | ||
| 119 | + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); | ||
| 120 | + | ||
| 121 | + // 调用 | ||
| 122 | + PageResult<MemberTagDO> pageResult = tagService.getTagPage(reqVO); | ||
| 123 | + // 断言 | ||
| 124 | + assertEquals(1, pageResult.getTotal()); | ||
| 125 | + assertEquals(1, pageResult.getList().size()); | ||
| 126 | + assertPojoEquals(dbTag, pageResult.getList().get(0)); | ||
| 127 | + } | ||
| 128 | + | ||
| 129 | + @Test | ||
| 130 | + public void testGetTagList() { | ||
| 131 | + // mock 数据 | ||
| 132 | + MemberTagDO dbTag = randomPojo(MemberTagDO.class, o -> { // 等会查询到 | ||
| 133 | + o.setName("test"); | ||
| 134 | + o.setCreateTime(buildTime(2023, 2, 18)); | ||
| 135 | + }); | ||
| 136 | + tagMapper.insert(dbTag); | ||
| 137 | + // 测试 name 不匹配 | ||
| 138 | + tagMapper.insert(cloneIgnoreId(dbTag, o -> o.setName("ne"))); | ||
| 139 | + // 测试 createTime 不匹配 | ||
| 140 | + tagMapper.insert(cloneIgnoreId(dbTag, o -> o.setCreateTime(null))); | ||
| 141 | + // 准备参数 | ||
| 142 | + MemberTagExportReqVO reqVO = new MemberTagExportReqVO(); | ||
| 143 | + reqVO.setName("test"); | ||
| 144 | + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); | ||
| 145 | + | ||
| 146 | + // 调用 | ||
| 147 | + List<MemberTagDO> list = tagService.getTagList(reqVO); | ||
| 148 | + // 断言 | ||
| 149 | + assertEquals(1, list.size()); | ||
| 150 | + assertPojoEquals(dbTag, list.get(0)); | ||
| 151 | + } | ||
| 152 | + | ||
| 153 | +} |
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/clean.sql
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
| @@ -33,3 +33,15 @@ CREATE TABLE IF NOT EXISTS "member_address" ( | @@ -33,3 +33,15 @@ CREATE TABLE IF NOT EXISTS "member_address" ( | ||
| 33 | PRIMARY KEY ("id") | 33 | PRIMARY KEY ("id") |
| 34 | ) COMMENT '用户收件地址'; | 34 | ) COMMENT '用户收件地址'; |
| 35 | 35 | ||
| 36 | +CREATE TABLE IF NOT EXISTS "member_tag" | ||
| 37 | +( | ||
| 38 | + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, | ||
| 39 | + "name" varchar NOT NULL, | ||
| 40 | + "creator" varchar DEFAULT '', | ||
| 41 | + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, | ||
| 42 | + "updater" varchar DEFAULT '', | ||
| 43 | + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, | ||
| 44 | + "deleted" bit NOT NULL DEFAULT FALSE, | ||
| 45 | + "tenant_id" bigint NOT NULL default '0', | ||
| 46 | + PRIMARY KEY ("id") | ||
| 47 | +) COMMENT '会员标签'; | ||
| 36 | \ No newline at end of file | 48 | \ No newline at end of file |