Commit ca51056c00c238d6b0a9e164c1c1493278c4e803

Authored by owen
1 parent bdb38c41

会员: 统一用户等级记录、用户经验记录 命名

Showing 22 changed files with 142 additions and 144 deletions
sql/mysql/member_level.sql
... ... @@ -22,7 +22,7 @@ create table member_level
22 22 )
23 23 comment '会员等级';
24 24  
25   -create table member_level_log
  25 +create table member_level_record
26 26 (
27 27 id bigint auto_increment comment '编号' primary key,
28 28 user_id bigint default 0 not null comment '用户编号',
... ... @@ -42,9 +42,9 @@ create table member_level_log
42 42 )
43 43 comment '会员等级记录';
44 44  
45   -create index idx_user_id on member_level_log (user_id) comment '会员等级记录-用户编号';
  45 +create index idx_user_id on member_level_record (user_id) comment '会员等级记录-用户编号';
46 46  
47   -create table member_experience_log
  47 +create table member_experience_record
48 48 (
49 49 id bigint auto_increment comment '编号' primary key,
50 50 user_id bigint default 0 not null comment '用户编号',
... ... @@ -63,8 +63,8 @@ create table member_experience_log
63 63 )
64 64 comment '会员经验记录';
65 65  
66   -create index idx_user_id on member_experience_log (user_id) comment '会员经验记录-用户编号';
67   -create index idx_user_biz_type on member_experience_log (user_id, biz_type) comment '会员经验记录-用户业务类型';
  66 +create index idx_user_id on member_experience_record (user_id) comment '会员经验记录-用户编号';
  67 +create index idx_user_biz_type on member_experience_record (user_id, biz_type) comment '会员经验记录-用户业务类型';
68 68  
69 69 -- 增加字典
70 70 insert system_dict_type(name, type) values ('会员经验业务类型', 'member_experience_biz_type');
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceLogController.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java
... ... @@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.member.controller.admin.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO;
6   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogRespVO;
7   -import cn.iocoder.yudao.module.member.convert.level.MemberExperienceLogConvert;
8   -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;
9   -import cn.iocoder.yudao.module.member.service.level.MemberExperienceLogService;
  5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.convert.level.MemberExperienceRecordConvert;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
  9 +import cn.iocoder.yudao.module.member.service.level.MemberExperienceRecordService;
10 10 import io.swagger.v3.oas.annotations.Operation;
11 11 import io.swagger.v3.oas.annotations.Parameter;
12 12 import io.swagger.v3.oas.annotations.tags.Tag;
... ... @@ -22,31 +22,30 @@ import javax.validation.Valid;
22 22  
23 23 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
24 24  
25   -// TODO @疯狂:要不 Log 改成 Record,和 PointRecord 保持一致
26 25 @Tag(name = "管理后台 - 会员经验记录")
27 26 @RestController
28   -@RequestMapping("/member/experience-log")
  27 +@RequestMapping("/member/experience-record")
29 28 @Validated
30   -public class MemberExperienceLogController {
  29 +public class MemberExperienceRecordController {
31 30  
32 31 @Resource
33   - private MemberExperienceLogService experienceLogService;
  32 + private MemberExperienceRecordService experienceLogService;
34 33  
35 34 @GetMapping("/get")
36 35 @Operation(summary = "获得会员经验记录")
37 36 @Parameter(name = "id", description = "编号", required = true, example = "1024")
38   - @PreAuthorize("@ss.hasPermission('member:experience-log:query')")
39   - public CommonResult<MemberExperienceLogRespVO> getExperienceLog(@RequestParam("id") Long id) {
40   - MemberExperienceLogDO experienceLog = experienceLogService.getExperienceLog(id);
41   - return success(MemberExperienceLogConvert.INSTANCE.convert(experienceLog));
  37 + @PreAuthorize("@ss.hasPermission('member:experience-record:query')")
  38 + public CommonResult<MemberExperienceRecordRespVO> getExperienceLog(@RequestParam("id") Long id) {
  39 + MemberExperienceRecordDO experienceLog = experienceLogService.getExperienceLog(id);
  40 + return success(MemberExperienceRecordConvert.INSTANCE.convert(experienceLog));
42 41 }
43 42  
44 43 @GetMapping("/page")
45 44 @Operation(summary = "获得会员经验记录分页")
46   - @PreAuthorize("@ss.hasPermission('member:experience-log:query')")
47   - public CommonResult<PageResult<MemberExperienceLogRespVO>> getExperienceLogPage(@Valid MemberExperienceLogPageReqVO pageVO) {
48   - PageResult<MemberExperienceLogDO> pageResult = experienceLogService.getExperienceLogPage(pageVO);
49   - return success(MemberExperienceLogConvert.INSTANCE.convertPage(pageResult));
  45 + @PreAuthorize("@ss.hasPermission('member:experience-record:query')")
  46 + public CommonResult<PageResult<MemberExperienceRecordRespVO>> getExperienceLogPage(@Valid MemberExperienceRecordPageReqVO pageVO) {
  47 + PageResult<MemberExperienceRecordDO> pageResult = experienceLogService.getExperienceLogPage(pageVO);
  48 + return success(MemberExperienceRecordConvert.INSTANCE.convertPage(pageResult));
50 49 }
51 50  
52 51 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelLogController.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java
... ... @@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.member.controller.admin.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;
6   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogRespVO;
7   -import cn.iocoder.yudao.module.member.convert.level.MemberLevelLogConvert;
8   -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;
9   -import cn.iocoder.yudao.module.member.service.level.MemberLevelLogService;
  5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.convert.level.MemberLevelRecordConvert;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
  9 +import cn.iocoder.yudao.module.member.service.level.MemberLevelRecordService;
10 10 import io.swagger.v3.oas.annotations.Operation;
11 11 import io.swagger.v3.oas.annotations.Parameter;
12 12 import io.swagger.v3.oas.annotations.tags.Tag;
... ... @@ -22,30 +22,29 @@ import javax.validation.Valid;
22 22  
23 23 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
24 24  
25   -// TODO @疯狂:是不是不用这个 controller;因为日志只是为了记录,db 可以查询、和审计即可,目前暂时不需要开放出来;
26 25 @Tag(name = "管理后台 - 会员等级记录")
27 26 @RestController
28   -@RequestMapping("/member/level-log")
  27 +@RequestMapping("/member/level-record")
29 28 @Validated
30   -public class MemberLevelLogController {
  29 +public class MemberLevelRecordController {
31 30  
32 31 @Resource
33   - private MemberLevelLogService levelLogService;
  32 + private MemberLevelRecordService levelLogService;
34 33  
35 34 @GetMapping("/get")
36 35 @Operation(summary = "获得会员等级记录")
37 36 @Parameter(name = "id", description = "编号", required = true, example = "1024")
38   - @PreAuthorize("@ss.hasPermission('member:level-log:query')")
39   - public CommonResult<MemberLevelLogRespVO> getLevelLog(@RequestParam("id") Long id) {
40   - MemberLevelLogDO levelLog = levelLogService.getLevelLog(id);
41   - return success(MemberLevelLogConvert.INSTANCE.convert(levelLog));
  37 + @PreAuthorize("@ss.hasPermission('member:level-record:query')")
  38 + public CommonResult<MemberLevelRecordRespVO> getLevelLog(@RequestParam("id") Long id) {
  39 + MemberLevelRecordDO levelLog = levelLogService.getLevelLog(id);
  40 + return success(MemberLevelRecordConvert.INSTANCE.convert(levelLog));
42 41 }
43 42  
44 43 @GetMapping("/page")
45 44 @Operation(summary = "获得会员等级记录分页")
46   - @PreAuthorize("@ss.hasPermission('member:level-log:query')")
47   - public CommonResult<PageResult<MemberLevelLogRespVO>> getLevelLogPage(@Valid MemberLevelLogPageReqVO pageVO) {
48   - PageResult<MemberLevelLogDO> pageResult = levelLogService.getLevelLogPage(pageVO);
49   - return success(MemberLevelLogConvert.INSTANCE.convertPage(pageResult));
  45 + @PreAuthorize("@ss.hasPermission('member:level-record:query')")
  46 + public CommonResult<PageResult<MemberLevelRecordRespVO>> getLevelLogPage(@Valid MemberLevelRecordPageReqVO pageVO) {
  47 + PageResult<MemberLevelRecordDO> pageResult = levelLogService.getLevelLogPage(pageVO);
  48 + return success(MemberLevelRecordConvert.INSTANCE.convertPage(pageResult));
50 49 }
51 50 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogBaseVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java
... ... @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
10 10 * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
11 11 */
12 12 @Data
13   -public class MemberExperienceLogBaseVO {
  13 +public class MemberExperienceRecordBaseVO {
14 14  
15 15 @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3638")
16 16 @NotNull(message = "用户编号不能为空")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogPageReqVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java
... ... @@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
15 15 @Data
16 16 @EqualsAndHashCode(callSuper = true)
17 17 @ToString(callSuper = true)
18   -public class MemberExperienceLogPageReqVO extends PageParam {
  18 +public class MemberExperienceRecordPageReqVO extends PageParam {
19 19  
20 20 @Schema(description = "用户编号", example = "3638")
21 21 private Long userId;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogRespVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java
... ... @@ -11,7 +11,7 @@ import java.time.LocalDateTime;
11 11 @Data
12 12 @EqualsAndHashCode(callSuper = true)
13 13 @ToString(callSuper = true)
14   -public class MemberExperienceLogRespVO extends MemberExperienceLogBaseVO {
  14 +public class MemberExperienceRecordRespVO extends MemberExperienceRecordBaseVO {
15 15  
16 16 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610")
17 17 private Long id;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogBaseVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordBaseVO.java
... ... @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
10 10 * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
11 11 */
12 12 @Data
13   -public class MemberLevelLogBaseVO {
  13 +public class MemberLevelRecordBaseVO {
14 14  
15 15 @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25923")
16 16 @NotNull(message = "用户编号不能为空")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogPageReqVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordPageReqVO.java
... ... @@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
15 15 @Data
16 16 @EqualsAndHashCode(callSuper = true)
17 17 @ToString(callSuper = true)
18   -public class MemberLevelLogPageReqVO extends PageParam {
  18 +public class MemberLevelRecordPageReqVO extends PageParam {
19 19  
20 20 @Schema(description = "用户编号", example = "25923")
21 21 private Long userId;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogRespVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordRespVO.java
... ... @@ -11,7 +11,7 @@ import java.time.LocalDateTime;
11 11 @Data
12 12 @EqualsAndHashCode(callSuper = true)
13 13 @ToString(callSuper = true)
14   -public class MemberLevelLogRespVO extends MemberLevelLogBaseVO {
  14 +public class MemberLevelRecordRespVO extends MemberLevelRecordBaseVO {
15 15  
16 16 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8741")
17 17 private Long id;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceLogConvert.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java
1 1 package cn.iocoder.yudao.module.member.convert.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogRespVO;
5   -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO;
  5 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
6 6 import org.mapstruct.Mapper;
7 7 import org.mapstruct.factory.Mappers;
8 8  
... ... @@ -14,14 +14,14 @@ import java.util.List;
14 14 * @author owen
15 15 */
16 16 @Mapper
17   -public interface MemberExperienceLogConvert {
  17 +public interface MemberExperienceRecordConvert {
18 18  
19   - MemberExperienceLogConvert INSTANCE = Mappers.getMapper(MemberExperienceLogConvert.class);
  19 + MemberExperienceRecordConvert INSTANCE = Mappers.getMapper(MemberExperienceRecordConvert.class);
20 20  
21   - MemberExperienceLogRespVO convert(MemberExperienceLogDO bean);
  21 + MemberExperienceRecordRespVO convert(MemberExperienceRecordDO bean);
22 22  
23   - List<MemberExperienceLogRespVO> convertList(List<MemberExperienceLogDO> list);
  23 + List<MemberExperienceRecordRespVO> convertList(List<MemberExperienceRecordDO> list);
24 24  
25   - PageResult<MemberExperienceLogRespVO> convertPage(PageResult<MemberExperienceLogDO> page);
  25 + PageResult<MemberExperienceRecordRespVO> convertPage(PageResult<MemberExperienceRecordDO> page);
26 26  
27 27 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelLogConvert.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java
1 1 package cn.iocoder.yudao.module.member.convert.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogRespVO;
5   -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordRespVO;
  5 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
6 6 import org.mapstruct.Mapper;
7 7 import org.mapstruct.factory.Mappers;
8 8  
... ... @@ -14,14 +14,14 @@ import java.util.List;
14 14 * @author owen
15 15 */
16 16 @Mapper
17   -public interface MemberLevelLogConvert {
  17 +public interface MemberLevelRecordConvert {
18 18  
19   - MemberLevelLogConvert INSTANCE = Mappers.getMapper(MemberLevelLogConvert.class);
  19 + MemberLevelRecordConvert INSTANCE = Mappers.getMapper(MemberLevelRecordConvert.class);
20 20  
21   - MemberLevelLogRespVO convert(MemberLevelLogDO bean);
  21 + MemberLevelRecordRespVO convert(MemberLevelRecordDO bean);
22 22  
23   - List<MemberLevelLogRespVO> convertList(List<MemberLevelLogDO> list);
  23 + List<MemberLevelRecordRespVO> convertList(List<MemberLevelRecordDO> list);
24 24  
25   - PageResult<MemberLevelLogRespVO> convertPage(PageResult<MemberLevelLogDO> page);
  25 + PageResult<MemberLevelRecordRespVO> convertPage(PageResult<MemberLevelRecordDO> page);
26 26  
27 27 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceLogDO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceRecordDO.java
... ... @@ -12,15 +12,15 @@ import lombok.*;
12 12 *
13 13 * @author owen
14 14 */
15   -@TableName("member_experience_log")
16   -@KeySequence("member_experience_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
  15 +@TableName("member_experience_record")
  16 +@KeySequence("member_experience_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
17 17 @Data
18 18 @EqualsAndHashCode(callSuper = true)
19 19 @ToString(callSuper = true)
20 20 @Builder
21 21 @NoArgsConstructor
22 22 @AllArgsConstructor
23   -public class MemberExperienceLogDO extends BaseDO {
  23 +public class MemberExperienceRecordDO extends BaseDO {
24 24  
25 25 /**
26 26 * 编号
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelLogDO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java
... ... @@ -13,15 +13,15 @@ import lombok.*;
13 13 *
14 14 * @author owen
15 15 */
16   -@TableName("member_level_log")
17   -@KeySequence("member_level_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
  16 +@TableName("member_level_record")
  17 +@KeySequence("member_level_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
18 18 @Data
19 19 @EqualsAndHashCode(callSuper = true)
20 20 @ToString(callSuper = true)
21 21 @Builder
22 22 @NoArgsConstructor
23 23 @AllArgsConstructor
24   -public class MemberLevelLogDO extends BaseDO {
  24 +public class MemberLevelRecordDO extends BaseDO {
25 25  
26 26 /**
27 27 * 编号
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceLogMapper.java deleted
1   -package cn.iocoder.yudao.module.member.dal.mysql.level;
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.level.vo.experience.MemberExperienceLogPageReqVO;
7   -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;
8   -import org.apache.ibatis.annotations.Mapper;
9   -
10   -/**
11   - * 会员经验记录 Mapper
12   - *
13   - * @author owen
14   - */
15   -@Mapper
16   -public interface MemberExperienceLogMapper extends BaseMapperX<MemberExperienceLogDO> {
17   -
18   - default PageResult<MemberExperienceLogDO> selectPage(MemberExperienceLogPageReqVO reqVO) {
19   - return selectPage(reqVO, new LambdaQueryWrapperX<MemberExperienceLogDO>()
20   - .eqIfPresent(MemberExperienceLogDO::getUserId, reqVO.getUserId())
21   - .eqIfPresent(MemberExperienceLogDO::getBizId, reqVO.getBizId())
22   - .eqIfPresent(MemberExperienceLogDO::getBizType, reqVO.getBizType())
23   - .eqIfPresent(MemberExperienceLogDO::getTitle, reqVO.getTitle())
24   - .betweenIfPresent(MemberExperienceLogDO::getCreateTime, reqVO.getCreateTime())
25   - .orderByDesc(MemberExperienceLogDO::getId));
26   - }
27   -
28   -}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceRecordMapper.java 0 → 100644
  1 +package cn.iocoder.yudao.module.member.dal.mysql.level;
  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.level.vo.experience.MemberExperienceRecordPageReqVO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +/**
  11 + * 会员经验记录 Mapper
  12 + *
  13 + * @author owen
  14 + */
  15 +@Mapper
  16 +public interface MemberExperienceRecordMapper extends BaseMapperX<MemberExperienceRecordDO> {
  17 +
  18 + default PageResult<MemberExperienceRecordDO> selectPage(MemberExperienceRecordPageReqVO reqVO) {
  19 + return selectPage(reqVO, new LambdaQueryWrapperX<MemberExperienceRecordDO>()
  20 + .eqIfPresent(MemberExperienceRecordDO::getUserId, reqVO.getUserId())
  21 + .eqIfPresent(MemberExperienceRecordDO::getBizId, reqVO.getBizId())
  22 + .eqIfPresent(MemberExperienceRecordDO::getBizType, reqVO.getBizType())
  23 + .eqIfPresent(MemberExperienceRecordDO::getTitle, reqVO.getTitle())
  24 + .betweenIfPresent(MemberExperienceRecordDO::getCreateTime, reqVO.getCreateTime())
  25 + .orderByDesc(MemberExperienceRecordDO::getId));
  26 + }
  27 +
  28 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelLogMapper.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelRecordMapper.java
... ... @@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.member.dal.mysql.level;
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;
7   -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
8 8 import org.apache.ibatis.annotations.Mapper;
9 9  
10 10 /**
... ... @@ -13,14 +13,14 @@ import org.apache.ibatis.annotations.Mapper;
13 13 * @author owen
14 14 */
15 15 @Mapper
16   -public interface MemberLevelLogMapper extends BaseMapperX<MemberLevelLogDO> {
  16 +public interface MemberLevelRecordMapper extends BaseMapperX<MemberLevelRecordDO> {
17 17  
18   - default PageResult<MemberLevelLogDO> selectPage(MemberLevelLogPageReqVO reqVO) {
19   - return selectPage(reqVO, new LambdaQueryWrapperX<MemberLevelLogDO>()
20   - .eqIfPresent(MemberLevelLogDO::getUserId, reqVO.getUserId())
21   - .eqIfPresent(MemberLevelLogDO::getLevelId, reqVO.getLevelId())
22   - .betweenIfPresent(MemberLevelLogDO::getCreateTime, reqVO.getCreateTime())
23   - .orderByDesc(MemberLevelLogDO::getId));
  18 + default PageResult<MemberLevelRecordDO> selectPage(MemberLevelRecordPageReqVO reqVO) {
  19 + return selectPage(reqVO, new LambdaQueryWrapperX<MemberLevelRecordDO>()
  20 + .eqIfPresent(MemberLevelRecordDO::getUserId, reqVO.getUserId())
  21 + .eqIfPresent(MemberLevelRecordDO::getLevelId, reqVO.getLevelId())
  22 + .betweenIfPresent(MemberLevelRecordDO::getCreateTime, reqVO.getCreateTime())
  23 + .orderByDesc(MemberLevelRecordDO::getId));
24 24 }
25 25  
26 26 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java
1 1 package cn.iocoder.yudao.module.member.service.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO;
5   -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
  5 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
6 6 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
7 7  
8 8 import java.util.Collection;
... ... @@ -13,7 +13,7 @@ import java.util.List;
13 13 *
14 14 * @author owen
15 15 */
16   -public interface MemberExperienceLogService {
  16 +public interface MemberExperienceRecordService {
17 17  
18 18 /**
19 19 * 获得会员经验记录
... ... @@ -21,7 +21,7 @@ public interface MemberExperienceLogService {
21 21 * @param id 编号
22 22 * @return 会员经验记录
23 23 */
24   - MemberExperienceLogDO getExperienceLog(Long id);
  24 + MemberExperienceRecordDO getExperienceLog(Long id);
25 25  
26 26 /**
27 27 * 获得会员经验记录列表
... ... @@ -29,7 +29,7 @@ public interface MemberExperienceLogService {
29 29 * @param ids 编号
30 30 * @return 会员经验记录列表
31 31 */
32   - List<MemberExperienceLogDO> getExperienceLogList(Collection<Long> ids);
  32 + List<MemberExperienceRecordDO> getExperienceLogList(Collection<Long> ids);
33 33  
34 34 /**
35 35 * 获得会员经验记录分页
... ... @@ -37,7 +37,7 @@ public interface MemberExperienceLogService {
37 37 * @param pageReqVO 分页查询
38 38 * @return 会员经验记录分页
39 39 */
40   - PageResult<MemberExperienceLogDO> getExperienceLogPage(MemberExperienceLogPageReqVO pageReqVO);
  40 + PageResult<MemberExperienceRecordDO> getExperienceLogPage(MemberExperienceRecordPageReqVO pageReqVO);
41 41  
42 42 /**
43 43 * 创建 手动调整 经验变动记录
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogServiceImpl.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordServiceImpl.java
... ... @@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.member.service.level;
2 2  
3 3 import cn.hutool.core.util.StrUtil;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO;
6   -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;
7   -import cn.iocoder.yudao.module.member.dal.mysql.level.MemberExperienceLogMapper;
  5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
  6 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
  7 +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberExperienceRecordMapper;
8 8 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
9 9 import org.springframework.stereotype.Service;
10 10 import org.springframework.validation.annotation.Validated;
... ... @@ -20,24 +20,24 @@ import java.util.List;
20 20 */
21 21 @Service
22 22 @Validated
23   -public class MemberExperienceLogServiceImpl implements MemberExperienceLogService {
  23 +public class MemberExperienceRecordServiceImpl implements MemberExperienceRecordService {
24 24  
25 25 @Resource
26   - private MemberExperienceLogMapper experienceLogMapper;
  26 + private MemberExperienceRecordMapper experienceLogMapper;
27 27  
28 28  
29 29 @Override
30   - public MemberExperienceLogDO getExperienceLog(Long id) {
  30 + public MemberExperienceRecordDO getExperienceLog(Long id) {
31 31 return experienceLogMapper.selectById(id);
32 32 }
33 33  
34 34 @Override
35   - public List<MemberExperienceLogDO> getExperienceLogList(Collection<Long> ids) {
  35 + public List<MemberExperienceRecordDO> getExperienceLogList(Collection<Long> ids) {
36 36 return experienceLogMapper.selectBatchIds(ids);
37 37 }
38 38  
39 39 @Override
40   - public PageResult<MemberExperienceLogDO> getExperienceLogPage(MemberExperienceLogPageReqVO pageReqVO) {
  40 + public PageResult<MemberExperienceRecordDO> getExperienceLogPage(MemberExperienceRecordPageReqVO pageReqVO) {
41 41 return experienceLogMapper.selectPage(pageReqVO);
42 42 }
43 43  
... ... @@ -50,7 +50,7 @@ public class MemberExperienceLogServiceImpl implements MemberExperienceLogServic
50 50  
51 51 @Override
52 52 public void createBizLog(Long userId, int experience, int totalExperience, MemberExperienceBizTypeEnum bizType, String bizId) {
53   - MemberExperienceLogDO experienceLogDO = new MemberExperienceLogDO();
  53 + MemberExperienceRecordDO experienceLogDO = new MemberExperienceRecordDO();
54 54 experienceLogDO.setUserId(userId);
55 55 experienceLogDO.setExperience(experience);
56 56 experienceLogDO.setTotalExperience(totalExperience);
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java
1 1 package cn.iocoder.yudao.module.member.service.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO;
5 5 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
6   -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;
  6 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
7 7 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
8 8  
9 9 import java.util.Collection;
... ... @@ -14,7 +14,7 @@ import java.util.List;
14 14 *
15 15 * @author owen
16 16 */
17   -public interface MemberLevelLogService {
  17 +public interface MemberLevelRecordService {
18 18  
19 19 /**
20 20 * 删除会员等级记录
... ... @@ -29,7 +29,7 @@ public interface MemberLevelLogService {
29 29 * @param id 编号
30 30 * @return 会员等级记录
31 31 */
32   - MemberLevelLogDO getLevelLog(Long id);
  32 + MemberLevelRecordDO getLevelLog(Long id);
33 33  
34 34 /**
35 35 * 获得会员等级记录列表
... ... @@ -37,7 +37,7 @@ public interface MemberLevelLogService {
37 37 * @param ids 编号
38 38 * @return 会员等级记录列表
39 39 */
40   - List<MemberLevelLogDO> getLevelLogList(Collection<Long> ids);
  40 + List<MemberLevelRecordDO> getLevelLogList(Collection<Long> ids);
41 41  
42 42 /**
43 43 * 获得会员等级记录分页
... ... @@ -45,7 +45,7 @@ public interface MemberLevelLogService {
45 45 * @param pageReqVO 分页查询
46 46 * @return 会员等级记录分页
47 47 */
48   - PageResult<MemberLevelLogDO> getLevelLogPage(MemberLevelLogPageReqVO pageReqVO);
  48 + PageResult<MemberLevelRecordDO> getLevelLogPage(MemberLevelRecordPageReqVO pageReqVO);
49 49  
50 50 /**
51 51 * 创建记录: 取消等级
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordServiceImpl.java
1 1 package cn.iocoder.yudao.module.member.service.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO;
5 5 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
6   -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;
  6 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
7 7 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
8   -import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelLogMapper;
  8 +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelRecordMapper;
9 9 import org.springframework.stereotype.Service;
10 10 import org.springframework.validation.annotation.Validated;
11 11  
... ... @@ -23,10 +23,10 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.LEVEL_LOG_
23 23 */
24 24 @Service
25 25 @Validated
26   -public class MemberLevelLogServiceImpl implements MemberLevelLogService {
  26 +public class MemberLevelRecordServiceImpl implements MemberLevelRecordService {
27 27  
28 28 @Resource
29   - private MemberLevelLogMapper levelLogMapper;
  29 + private MemberLevelRecordMapper levelLogMapper;
30 30  
31 31 @Override
32 32 public void deleteLevelLog(Long id) {
... ... @@ -43,23 +43,23 @@ public class MemberLevelLogServiceImpl implements MemberLevelLogService {
43 43 }
44 44  
45 45 @Override
46   - public MemberLevelLogDO getLevelLog(Long id) {
  46 + public MemberLevelRecordDO getLevelLog(Long id) {
47 47 return levelLogMapper.selectById(id);
48 48 }
49 49  
50 50 @Override
51   - public List<MemberLevelLogDO> getLevelLogList(Collection<Long> ids) {
  51 + public List<MemberLevelRecordDO> getLevelLogList(Collection<Long> ids) {
52 52 return levelLogMapper.selectBatchIds(ids);
53 53 }
54 54  
55 55 @Override
56   - public PageResult<MemberLevelLogDO> getLevelLogPage(MemberLevelLogPageReqVO pageReqVO) {
  56 + public PageResult<MemberLevelRecordDO> getLevelLogPage(MemberLevelRecordPageReqVO pageReqVO) {
57 57 return levelLogMapper.selectPage(pageReqVO);
58 58 }
59 59  
60 60 @Override
61 61 public void createCancelLog(Long userId, String reason) {
62   - MemberLevelLogDO levelLogDO = new MemberLevelLogDO();
  62 + MemberLevelRecordDO levelLogDO = new MemberLevelRecordDO();
63 63 levelLogDO.setUserId(userId);
64 64 levelLogDO.setRemark(reason);
65 65 levelLogDO.setDescription("管理员取消");
... ... @@ -71,7 +71,7 @@ public class MemberLevelLogServiceImpl implements MemberLevelLogService {
71 71  
72 72 @Override
73 73 public void createAdjustLog(MemberUserDO user, MemberLevelDO level, int experience, String reason) {
74   - MemberLevelLogDO levelLogDO = new MemberLevelLogDO();
  74 + MemberLevelRecordDO levelLogDO = new MemberLevelRecordDO();
75 75 levelLogDO.setUserId(user.getId());
76 76 levelLogDO.setLevelId(level.getId());
77 77 levelLogDO.setLevel(level.getLevel());
... ... @@ -88,7 +88,7 @@ public class MemberLevelLogServiceImpl implements MemberLevelLogService {
88 88  
89 89 @Override
90 90 public void createAutoUpgradeLog(MemberUserDO user, MemberLevelDO level) {
91   - MemberLevelLogDO levelLogDO = new MemberLevelLogDO();
  91 + MemberLevelRecordDO levelLogDO = new MemberLevelRecordDO();
92 92 levelLogDO.setUserId(user.getId());
93 93 levelLogDO.setLevelId(level.getId());
94 94 levelLogDO.setLevel(level.getLevel());
... ... @@ -102,7 +102,7 @@ public class MemberLevelLogServiceImpl implements MemberLevelLogService {
102 102 notifyMember(user.getId(), levelLogDO);
103 103 }
104 104  
105   - private void notifyMember(Long userId, MemberLevelLogDO level) {
  105 + private void notifyMember(Long userId, MemberLevelRecordDO level) {
106 106 //todo: 给会员发消息
107 107 }
108 108  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
... ... @@ -42,9 +42,9 @@ public class MemberLevelServiceImpl implements MemberLevelService {
42 42 @Resource
43 43 private MemberLevelMapper levelMapper;
44 44 @Resource
45   - private MemberLevelLogService memberLevelLogService;
  45 + private MemberLevelRecordService memberLevelRecordService;
46 46 @Resource
47   - private MemberExperienceLogService memberExperienceLogService;
  47 + private MemberExperienceRecordService memberExperienceRecordService;
48 48 @Resource
49 49 private MemberUserMapper memberUserMapper;
50 50  
... ... @@ -203,7 +203,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
203 203 experience = -user.getExperience();
204 204  
205 205 // 取消了会员的等级
206   - memberLevelLogService.createCancelLog(user.getId(), updateReqVO.getReason());
  206 + memberLevelRecordService.createCancelLog(user.getId(), updateReqVO.getReason());
207 207 memberUserMapper.updateUserLevelToNull(user.getId());
208 208 } else {
209 209 MemberLevelDO level = validateLevelExists(updateReqVO.getLevelId());
... ... @@ -212,7 +212,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
212 212 // 会员当前的经验 = 等级的升级经验
213 213 totalExperience = level.getExperience();
214 214  
215   - memberLevelLogService.createAdjustLog(user, level, experience, updateReqVO.getReason());
  215 + memberLevelRecordService.createAdjustLog(user, level, experience, updateReqVO.getReason());
216 216  
217 217 // 更新会员表上的等级编号、经验值
218 218 updateUserLevelIdAndExperience(user.getId(), updateReqVO.getLevelId(), totalExperience);
... ... @@ -220,7 +220,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
220 220  
221 221  
222 222 // 记录会员经验变动
223   - memberExperienceLogService.createAdjustLog(user.getId(), experience, totalExperience);
  223 + memberExperienceRecordService.createAdjustLog(user.getId(), experience, totalExperience);
224 224 }
225 225  
226 226 @Transactional(rollbackFor = Exception.class)
... ... @@ -239,7 +239,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
239 239 int userExperience = NumberUtil.max(user.getExperience() + experience, 0);
240 240  
241 241 // 创建经验记录
242   - memberExperienceLogService.createBizLog(userId, experience, userExperience, bizType, bizId);
  242 + memberExperienceRecordService.createBizLog(userId, experience, userExperience, bizType, bizId);
243 243  
244 244 // 计算会员等级
245 245 Long levelId = calcLevel(user, userExperience);
... ... @@ -284,7 +284,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
284 284 }
285 285  
286 286 // 保存等级变更记录
287   - memberLevelLogService.createAutoUpgradeLog(user, matchLevel);
  287 + memberLevelRecordService.createAutoUpgradeLog(user, matchLevel);
288 288 return matchLevel.getId();
289 289 }
290 290 }
... ...
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java
... ... @@ -41,9 +41,9 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest {
41 41 private MemberLevelMapper levelMapper;
42 42  
43 43 @MockBean
44   - private MemberLevelLogService memberLevelLogService;
  44 + private MemberLevelRecordService memberLevelRecordService;
45 45 @MockBean
46   - private MemberExperienceLogService memberExperienceLogService;
  46 + private MemberExperienceRecordService memberExperienceRecordService;
47 47  
48 48 @Test
49 49 public void testCreateLevel_success() {
... ...