From bdb38c41572091f38469f26695cada8e7341e9cc Mon Sep 17 00:00:00 2001 From: owen Date: Tue, 22 Aug 2023 11:23:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=9A=E5=91=98:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A7=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E7=9A=84=E8=A1=A8=E5=8D=95=E3=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/member_level.sql | 4 +++ .../member/enums/ErrorCodeConstants.java | 1 - .../admin/user/MemberUserController.java | 9 ++++++ .../user/vo/MemberUserUpdateLevelReqVO.java | 31 +++++++++++++++++++ .../admin/user/vo/MemberUserUpdateReqVO.java | 3 -- .../dal/mysql/user/MemberUserMapper.java | 3 +- .../service/level/MemberLevelService.java | 9 ++---- .../service/level/MemberLevelServiceImpl.java | 31 ++++++++++--------- .../service/user/MemberUserServiceImpl.java | 8 ----- 9 files changed, 64 insertions(+), 35 deletions(-) create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java diff --git a/sql/mysql/member_level.sql b/sql/mysql/member_level.sql index cdb8618e5..dfab05eb9 100644 --- a/sql/mysql/member_level.sql +++ b/sql/mysql/member_level.sql @@ -92,3 +92,7 @@ INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, com VALUES ('会员等级更新', 'member:level:update', 3, 3, @parentId, '', '', '', 0); INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status) VALUES ('会员等级删除', 'member:level:delete', 3, 4, @parentId, '', '', '', 0); + +-- 会员用户管理： 增加按钮权限 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status) +VALUES ('用户等级修改', 'member:user:update-level', 3, 5, 2309, '', '', '', 0); \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java index 3959c616f..c2278b136 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java +++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java @@ -50,7 +50,6 @@ public interface ErrorCodeConstants { ErrorCode LEVEL_LOG_NOT_EXISTS = new ErrorCode(1004011100, "用户等级记录不存在"); ErrorCode EXPERIENCE_LOG_NOT_EXISTS = new ErrorCode(1004011200, "用户经验记录不存在"); - ErrorCode LEVEL_REASON_NOT_EXISTS = new ErrorCode(1004011300, "用户等级调整原因不能为空"); //========== 用户分组 1004012000 ========== ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1004012000, "用户分组不存在"); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java index a12d114b2..ccb9d5da5 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO; +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO; @@ -52,6 +53,14 @@ public class MemberUserController { return success(true); } + @PutMapping("/update-level") + @Operation(summary = "更新会员用户等级") + @PreAuthorize("@ss.hasPermission('member:user:update-level')") + public CommonResult updateUserLevel(@Valid @RequestBody MemberUserUpdateLevelReqVO updateReqVO) { + memberLevelService.updateUserLevel(updateReqVO); + return success(true); + } + @GetMapping("/get") @Operation(summary = "获得会员用户") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java new file mode 100644 index 000000000..a2ca91135 --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java @@ -0,0 +1,31 @@ +package cn.iocoder.yudao.module.member.controller.admin.user.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Schema(description = "管理后台 - 会员用户 修改等级 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MemberUserUpdateLevelReqVO extends MemberUserBaseVO { + + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23788") + @NotNull(message = "用户编号不能为空") + private Long id; + + /** + * 取消用户等级时，值为空 + */ + @Schema(description = "用户等级编号", example = "1") + private Long levelId; + + @Schema(description = "修改原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要") + @NotBlank(message = "修改原因不能为空") + private String reason; + +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java index f4920aa1b..c6a92758d 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java @@ -17,7 +17,4 @@ public class MemberUserUpdateReqVO extends MemberUserBaseVO { @NotNull(message = "编号不能为空") private Long id; - @Schema(description = "会员级别修改原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要") - private String levelReason; - } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java index d85b5d0e5..630c7a989 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java @@ -50,14 +50,13 @@ public interface MemberUserMapper extends BaseMapperX { .orderByDesc(MemberUserDO::getId)); } - // TODO @疯狂：命名可以改成 updateUserLevelToNull；db 侧的操作，尽量无业务含义，更多是 select、update、insert 操作 /** * 取消会员的等级 * * @param userId 会员编号 * @return 受影响的行数 */ - default int cancelUserLevel(Long userId) { + default int updateUserLevelToNull(Long userId) { return update(null, new LambdaUpdateWrapper() .eq(MemberUserDO::getId, userId) .set(MemberUserDO::getExperience, 0) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java index a9f876071..e604435a3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java @@ -5,11 +5,10 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; -import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; -import javax.annotation.Nullable; import javax.validation.Valid; import java.util.Collection; import java.util.List; @@ -89,11 +88,9 @@ public interface MemberLevelService { /** * 修改会员的等级 * - * @param user 会员 - * @param levelId 要修改的等级编号，编号为空时，代表取消会员的等级 - * @param levelReason 修改原因 + * @param updateReqVO 修改参数 */ - void updateUserLevel(MemberUserDO user, @Nullable Long levelId, String levelReason); + void updateUserLevel(MemberUserUpdateLevelReqVO updateReqVO); /** * 增加会员经验 diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java index 947d100f9..71678d470 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java @@ -4,11 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO; import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; @@ -180,41 +180,42 @@ public class MemberLevelServiceImpl implements MemberLevelService { @Transactional(rollbackFor = Exception.class) @Override - public void updateUserLevel(MemberUserDO user, Long levelId, String reason) { + public void updateUserLevel(MemberUserUpdateLevelReqVO updateReqVO) { + MemberUserDO user = memberUserMapper.selectById(updateReqVO.getId()); + if (user == null) { + throw exception(USER_NOT_EXISTS); + } + // 未调整的情况1 - if (user.getLevelId() == null && levelId == null) { + if (user.getLevelId() == null && updateReqVO.getLevelId() == null) { return; } // 未调整的情况2 - if (ObjUtil.equal(user.getLevelId(), levelId)) { + if (ObjUtil.equal(user.getLevelId(), updateReqVO.getLevelId())) { return; } - // 需要后台用户填写为什么调整会员的等级 - if (StrUtil.isBlank(reason)) { - throw exception(LEVEL_REASON_NOT_EXISTS); - } - int experience; int totalExperience = 0; // 记录等级变动 - if (levelId == null) { + if (updateReqVO.getLevelId() == null) { + // 取消用户等级时，为扣减经验 experience = -user.getExperience(); // 取消了会员的等级 - memberLevelLogService.createCancelLog(user.getId(), reason); - memberUserMapper.cancelUserLevel(user.getId()); + memberLevelLogService.createCancelLog(user.getId(), updateReqVO.getReason()); + memberUserMapper.updateUserLevelToNull(user.getId()); } else { - MemberLevelDO level = validateLevelExists(levelId); + MemberLevelDO level = validateLevelExists(updateReqVO.getLevelId()); // 变动经验值 = 等级的升级经验 - 会员当前的经验；正数为增加经验，负数为扣减经验 experience = level.getExperience() - user.getExperience(); // 会员当前的经验 = 等级的升级经验 totalExperience = level.getExperience(); - memberLevelLogService.createAdjustLog(user, level, experience, reason); + memberLevelLogService.createAdjustLog(user, level, experience, updateReqVO.getReason()); // 更新会员表上的等级编号、经验值 - updateUserLevelIdAndExperience(user.getId(), levelId, totalExperience); + updateUserLevelIdAndExperience(user.getId(), updateReqVO.getLevelId(), totalExperience); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index 880aa792b..421cf5b90 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -15,7 +15,6 @@ import cn.iocoder.yudao.module.member.convert.auth.AuthConvert; import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; -import cn.iocoder.yudao.module.member.service.level.MemberLevelService; import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; @@ -56,9 +55,6 @@ public class MemberUserServiceImpl implements MemberUserService { @Resource private PasswordEncoder passwordEncoder; - @Resource - private MemberLevelService memberLevelService; - @Override public MemberUserDO getUserByMobile(String mobile) { return memberUserMapper.selectByMobile(mobile); @@ -195,10 +191,6 @@ public class MemberUserServiceImpl implements MemberUserService { // 更新 MemberUserDO updateObj = MemberUserConvert.INSTANCE.convert(updateReqVO); memberUserMapper.updateById(updateObj); - - // 会员级别修改 - // TODO @疯狂：修改用户等级，要不要单独一个前端操作 + 接口；因为它是个相对严肃独立的动作 - memberLevelService.updateUserLevel(user, updateReqVO.getLevelId(), updateReqVO.getLevelReason()); } @VisibleForTesting From ca51056c00c238d6b0a9e164c1c1493278c4e803 Mon Sep 17 00:00:00 2001 From: owen Date: Tue, 22 Aug 2023 20:49:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=9A=E5=91=98:=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AD=89=E7=BA=A7=E8=AE=B0=E5=BD=95=E3=80=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=8F=E9=AA=8C=E8=AE=B0=E5=BD=95=20?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/member_level.sql | 10 +++--- ... => MemberExperienceRecordController.java} | 33 +++++++++---------- ....java => MemberLevelRecordController.java} | 33 +++++++++---------- ...java => MemberExperienceRecordBaseVO.java} | 2 +- ...a => MemberExperienceRecordPageReqVO.java} | 2 +- ...java => MemberExperienceRecordRespVO.java} | 2 +- ...seVO.java => MemberLevelRecordBaseVO.java} | 2 +- ...O.java => MemberLevelRecordPageReqVO.java} | 2 +- ...spVO.java => MemberLevelRecordRespVO.java} | 2 +- .../level/MemberExperienceLogConvert.java | 27 --------------- .../level/MemberExperienceRecordConvert.java | 27 +++++++++++++++ .../convert/level/MemberLevelLogConvert.java | 27 --------------- .../level/MemberLevelRecordConvert.java | 27 +++++++++++++++ ...gDO.java => MemberExperienceRecordDO.java} | 6 ++-- ...velLogDO.java => MemberLevelRecordDO.java} | 6 ++-- .../level/MemberExperienceLogMapper.java | 28 ---------------- .../level/MemberExperienceRecordMapper.java | 28 ++++++++++++++++ ...pper.java => MemberLevelRecordMapper.java} | 18 +++++----- ...ava => MemberExperienceRecordService.java} | 12 +++---- ...=> MemberExperienceRecordServiceImpl.java} | 18 +++++----- ...ice.java => MemberLevelRecordService.java} | 12 +++---- ...java => MemberLevelRecordServiceImpl.java} | 24 +++++++------- .../service/level/MemberLevelServiceImpl.java | 14 ++++---- .../level/MemberLevelServiceImplTest.java | 4 +-- 24 files changed, 182 insertions(+), 184 deletions(-) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/{MemberExperienceLogController.java => MemberExperienceRecordController.java} (58%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/{MemberLevelLogController.java => MemberLevelRecordController.java} (54%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/{MemberExperienceLogBaseVO.java => MemberExperienceRecordBaseVO.java} (97%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/{MemberExperienceLogPageReqVO.java => MemberExperienceRecordPageReqVO.java} (94%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/{MemberExperienceLogRespVO.java => MemberExperienceRecordRespVO.java} (88%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/{MemberLevelLogBaseVO.java => MemberLevelRecordBaseVO.java} (97%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/{MemberLevelLogPageReqVO.java => MemberLevelRecordPageReqVO.java} (94%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/{MemberLevelLogRespVO.java => MemberLevelRecordRespVO.java} (89%) delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceLogConvert.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelLogConvert.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/{MemberExperienceLogDO.java => MemberExperienceRecordDO.java} (81%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/{MemberLevelLogDO.java => MemberLevelRecordDO.java} (82%) delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceLogMapper.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceRecordMapper.java rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/{MemberLevelLogMapper.java => MemberLevelRecordMapper.java} (50%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/{MemberExperienceLogService.java => MemberExperienceRecordService.java} (81%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/{MemberExperienceLogServiceImpl.java => MemberExperienceRecordServiceImpl.java} (76%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/{MemberLevelLogService.java => MemberLevelRecordService.java} (84%) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/{MemberLevelLogServiceImpl.java => MemberLevelRecordServiceImpl.java} (81%) diff --git a/sql/mysql/member_level.sql b/sql/mysql/member_level.sql index dfab05eb9..50008e990 100644 --- a/sql/mysql/member_level.sql +++ b/sql/mysql/member_level.sql @@ -22,7 +22,7 @@ create table member_level ) comment '会员等级'; -create table member_level_log +create table member_level_record ( id bigint auto_increment comment '编号' primary key, user_id bigint default 0 not null comment '用户编号', @@ -42,9 +42,9 @@ create table member_level_log ) comment '会员等级记录'; -create index idx_user_id on member_level_log (user_id) comment '会员等级记录-用户编号'; +create index idx_user_id on member_level_record (user_id) comment '会员等级记录-用户编号'; -create table member_experience_log +create table member_experience_record ( id bigint auto_increment comment '编号' primary key, user_id bigint default 0 not null comment '用户编号', @@ -63,8 +63,8 @@ create table member_experience_log ) comment '会员经验记录'; -create index idx_user_id on member_experience_log (user_id) comment '会员经验记录-用户编号'; -create index idx_user_biz_type on member_experience_log (user_id, biz_type) comment '会员经验记录-用户业务类型'; +create index idx_user_id on member_experience_record (user_id) comment '会员经验记录-用户编号'; +create index idx_user_biz_type on member_experience_record (user_id, biz_type) comment '会员经验记录-用户业务类型'; -- 增加字典 insert system_dict_type(name, type) values ('会员经验业务类型', 'member_experience_biz_type'); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceLogController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java similarity index 58% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceLogController.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java index 3bc63004d..81c61df42 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceLogController.java +++ b/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; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogRespVO; -import cn.iocoder.yudao.module.member.convert.level.MemberExperienceLogConvert; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; -import cn.iocoder.yudao.module.member.service.level.MemberExperienceLogService; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO; +import cn.iocoder.yudao.module.member.convert.level.MemberExperienceRecordConvert; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO; +import cn.iocoder.yudao.module.member.service.level.MemberExperienceRecordService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,31 +22,30 @@ import javax.validation.Valid; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -// TODO @疯狂：要不 Log 改成 Record，和 PointRecord 保持一致 @Tag(name = "管理后台 - 会员经验记录") @RestController -@RequestMapping("/member/experience-log") +@RequestMapping("/member/experience-record") @Validated -public class MemberExperienceLogController { +public class MemberExperienceRecordController { @Resource - private MemberExperienceLogService experienceLogService; + private MemberExperienceRecordService experienceLogService; @GetMapping("/get") @Operation(summary = "获得会员经验记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('member:experience-log:query')") - public CommonResult getExperienceLog(@RequestParam("id") Long id) { - MemberExperienceLogDO experienceLog = experienceLogService.getExperienceLog(id); - return success(MemberExperienceLogConvert.INSTANCE.convert(experienceLog)); + @PreAuthorize("@ss.hasPermission('member:experience-record:query')") + public CommonResult getExperienceLog(@RequestParam("id") Long id) { + MemberExperienceRecordDO experienceLog = experienceLogService.getExperienceLog(id); + return success(MemberExperienceRecordConvert.INSTANCE.convert(experienceLog)); } @GetMapping("/page") @Operation(summary = "获得会员经验记录分页") - @PreAuthorize("@ss.hasPermission('member:experience-log:query')") - public CommonResult> getExperienceLogPage(@Valid MemberExperienceLogPageReqVO pageVO) { - PageResult pageResult = experienceLogService.getExperienceLogPage(pageVO); - return success(MemberExperienceLogConvert.INSTANCE.convertPage(pageResult)); + @PreAuthorize("@ss.hasPermission('member:experience-record:query')") + public CommonResult> getExperienceLogPage(@Valid MemberExperienceRecordPageReqVO pageVO) { + PageResult pageResult = experienceLogService.getExperienceLogPage(pageVO); + return success(MemberExperienceRecordConvert.INSTANCE.convertPage(pageResult)); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelLogController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java similarity index 54% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelLogController.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java index c4eb1497f..d81bf4893 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelLogController.java +++ b/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; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogRespVO; -import cn.iocoder.yudao.module.member.convert.level.MemberLevelLogConvert; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; -import cn.iocoder.yudao.module.member.service.level.MemberLevelLogService; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordRespVO; +import cn.iocoder.yudao.module.member.convert.level.MemberLevelRecordConvert; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO; +import cn.iocoder.yudao.module.member.service.level.MemberLevelRecordService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,30 +22,29 @@ import javax.validation.Valid; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -// TODO @疯狂：是不是不用这个 controller；因为日志只是为了记录，db 可以查询、和审计即可，目前暂时不需要开放出来； @Tag(name = "管理后台 - 会员等级记录") @RestController -@RequestMapping("/member/level-log") +@RequestMapping("/member/level-record") @Validated -public class MemberLevelLogController { +public class MemberLevelRecordController { @Resource - private MemberLevelLogService levelLogService; + private MemberLevelRecordService levelLogService; @GetMapping("/get") @Operation(summary = "获得会员等级记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('member:level-log:query')") - public CommonResult getLevelLog(@RequestParam("id") Long id) { - MemberLevelLogDO levelLog = levelLogService.getLevelLog(id); - return success(MemberLevelLogConvert.INSTANCE.convert(levelLog)); + @PreAuthorize("@ss.hasPermission('member:level-record:query')") + public CommonResult getLevelLog(@RequestParam("id") Long id) { + MemberLevelRecordDO levelLog = levelLogService.getLevelLog(id); + return success(MemberLevelRecordConvert.INSTANCE.convert(levelLog)); } @GetMapping("/page") @Operation(summary = "获得会员等级记录分页") - @PreAuthorize("@ss.hasPermission('member:level-log:query')") - public CommonResult> getLevelLogPage(@Valid MemberLevelLogPageReqVO pageVO) { - PageResult pageResult = levelLogService.getLevelLogPage(pageVO); - return success(MemberLevelLogConvert.INSTANCE.convertPage(pageResult)); + @PreAuthorize("@ss.hasPermission('member:level-record:query')") + public CommonResult> getLevelLogPage(@Valid MemberLevelRecordPageReqVO pageVO) { + PageResult pageResult = levelLogService.getLevelLogPage(pageVO); + return success(MemberLevelRecordConvert.INSTANCE.convertPage(pageResult)); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogBaseVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java similarity index 97% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogBaseVO.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java index b7906a672..7c71f8270 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogBaseVO.java +++ b/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; * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data -public class MemberExperienceLogBaseVO { +public class MemberExperienceRecordBaseVO { @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3638") @NotNull(message = "用户编号不能为空") diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java similarity index 94% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogPageReqVO.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java index a92dcda11..d18201d7c 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogPageReqVO.java +++ b/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_ @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MemberExperienceLogPageReqVO extends PageParam { +public class MemberExperienceRecordPageReqVO extends PageParam { @Schema(description = "用户编号", example = "3638") private Long userId; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java similarity index 88% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogRespVO.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java index fb3779d1e..5e652fcf0 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogRespVO.java +++ b/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; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MemberExperienceLogRespVO extends MemberExperienceLogBaseVO { +public class MemberExperienceRecordRespVO extends MemberExperienceRecordBaseVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610") private Long id; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogBaseVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordBaseVO.java similarity index 97% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogBaseVO.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordBaseVO.java index 845b02435..4538988db 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogBaseVO.java +++ b/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; * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data -public class MemberLevelLogBaseVO { +public class MemberLevelRecordBaseVO { @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25923") @NotNull(message = "用户编号不能为空") diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordPageReqVO.java similarity index 94% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogPageReqVO.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordPageReqVO.java index 526503bed..2c7337b47 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogPageReqVO.java +++ b/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_ @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MemberLevelLogPageReqVO extends PageParam { +public class MemberLevelRecordPageReqVO extends PageParam { @Schema(description = "用户编号", example = "25923") private Long userId; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordRespVO.java similarity index 89% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogRespVO.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordRespVO.java index dfb2adb0a..290340a8e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogRespVO.java +++ b/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; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MemberLevelLogRespVO extends MemberLevelLogBaseVO { +public class MemberLevelRecordRespVO extends MemberLevelRecordBaseVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8741") private Long id; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceLogConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceLogConvert.java deleted file mode 100644 index 288ec094a..000000000 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceLogConvert.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.member.convert.level; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogRespVO; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 会员经验记录 Convert - * - * @author owen - */ -@Mapper -public interface MemberExperienceLogConvert { - - MemberExperienceLogConvert INSTANCE = Mappers.getMapper(MemberExperienceLogConvert.class); - - MemberExperienceLogRespVO convert(MemberExperienceLogDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - -} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java new file mode 100644 index 000000000..6902fccfd --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java @@ -0,0 +1,27 @@ +package cn.iocoder.yudao.module.member.convert.level; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * 会员经验记录 Convert + * + * @author owen + */ +@Mapper +public interface MemberExperienceRecordConvert { + + MemberExperienceRecordConvert INSTANCE = Mappers.getMapper(MemberExperienceRecordConvert.class); + + MemberExperienceRecordRespVO convert(MemberExperienceRecordDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelLogConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelLogConvert.java deleted file mode 100644 index 133f71209..000000000 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelLogConvert.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.member.convert.level; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogRespVO; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 会员等级记录 Convert - * - * @author owen - */ -@Mapper -public interface MemberLevelLogConvert { - - MemberLevelLogConvert INSTANCE = Mappers.getMapper(MemberLevelLogConvert.class); - - MemberLevelLogRespVO convert(MemberLevelLogDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - -} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java new file mode 100644 index 000000000..3770cc3d4 --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java @@ -0,0 +1,27 @@ +package cn.iocoder.yudao.module.member.convert.level; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordRespVO; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * 会员等级记录 Convert + * + * @author owen + */ +@Mapper +public interface MemberLevelRecordConvert { + + MemberLevelRecordConvert INSTANCE = Mappers.getMapper(MemberLevelRecordConvert.class); + + MemberLevelRecordRespVO convert(MemberLevelRecordDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceLogDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceRecordDO.java similarity index 81% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceLogDO.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceRecordDO.java index 5324ac328..a8a7bef17 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceLogDO.java +++ b/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.*; * * @author owen */ -@TableName("member_experience_log") -@KeySequence("member_experience_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("member_experience_record") +@KeySequence("member_experience_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class MemberExperienceLogDO extends BaseDO { +public class MemberExperienceRecordDO extends BaseDO { /** * 编号 diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelLogDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java similarity index 82% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelLogDO.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java index 8ab63b18f..289dae983 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelLogDO.java +++ b/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.*; * * @author owen */ -@TableName("member_level_log") -@KeySequence("member_level_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("member_level_record") +@KeySequence("member_level_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class MemberLevelLogDO extends BaseDO { +public class MemberLevelRecordDO extends BaseDO { /** * 编号 diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceLogMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceLogMapper.java deleted file mode 100644 index 956e61cf6..000000000 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceLogMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.iocoder.yudao.module.member.dal.mysql.level; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 会员经验记录 Mapper - * - * @author owen - */ -@Mapper -public interface MemberExperienceLogMapper extends BaseMapperX { - - default PageResult selectPage(MemberExperienceLogPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MemberExperienceLogDO::getUserId, reqVO.getUserId()) - .eqIfPresent(MemberExperienceLogDO::getBizId, reqVO.getBizId()) - .eqIfPresent(MemberExperienceLogDO::getBizType, reqVO.getBizType()) - .eqIfPresent(MemberExperienceLogDO::getTitle, reqVO.getTitle()) - .betweenIfPresent(MemberExperienceLogDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MemberExperienceLogDO::getId)); - } - -} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceRecordMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceRecordMapper.java new file mode 100644 index 000000000..8e5065472 --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceRecordMapper.java @@ -0,0 +1,28 @@ +package cn.iocoder.yudao.module.member.dal.mysql.level; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员经验记录 Mapper + * + * @author owen + */ +@Mapper +public interface MemberExperienceRecordMapper extends BaseMapperX { + + default PageResult selectPage(MemberExperienceRecordPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MemberExperienceRecordDO::getUserId, reqVO.getUserId()) + .eqIfPresent(MemberExperienceRecordDO::getBizId, reqVO.getBizId()) + .eqIfPresent(MemberExperienceRecordDO::getBizType, reqVO.getBizType()) + .eqIfPresent(MemberExperienceRecordDO::getTitle, reqVO.getTitle()) + .betweenIfPresent(MemberExperienceRecordDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(MemberExperienceRecordDO::getId)); + } + +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelLogMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelRecordMapper.java similarity index 50% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelLogMapper.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelRecordMapper.java index d4bdbc3f4..d10b1690b 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelLogMapper.java +++ b/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; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO; import org.apache.ibatis.annotations.Mapper; /** @@ -13,14 +13,14 @@ import org.apache.ibatis.annotations.Mapper; * @author owen */ @Mapper -public interface MemberLevelLogMapper extends BaseMapperX { +public interface MemberLevelRecordMapper extends BaseMapperX { - default PageResult selectPage(MemberLevelLogPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MemberLevelLogDO::getUserId, reqVO.getUserId()) - .eqIfPresent(MemberLevelLogDO::getLevelId, reqVO.getLevelId()) - .betweenIfPresent(MemberLevelLogDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MemberLevelLogDO::getId)); + default PageResult selectPage(MemberLevelRecordPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MemberLevelRecordDO::getUserId, reqVO.getUserId()) + .eqIfPresent(MemberLevelRecordDO::getLevelId, reqVO.getLevelId()) + .betweenIfPresent(MemberLevelRecordDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(MemberLevelRecordDO::getId)); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java similarity index 81% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java index 0cb4389dc..92b34b365 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.member.service.level; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO; import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; import java.util.Collection; @@ -13,7 +13,7 @@ import java.util.List; * * @author owen */ -public interface MemberExperienceLogService { +public interface MemberExperienceRecordService { /** * 获得会员经验记录 @@ -21,7 +21,7 @@ public interface MemberExperienceLogService { * @param id 编号 * @return 会员经验记录 */ - MemberExperienceLogDO getExperienceLog(Long id); + MemberExperienceRecordDO getExperienceLog(Long id); /** * 获得会员经验记录列表 @@ -29,7 +29,7 @@ public interface MemberExperienceLogService { * @param ids 编号 * @return 会员经验记录列表 */ - List getExperienceLogList(Collection ids); + List getExperienceLogList(Collection ids); /** * 获得会员经验记录分页 @@ -37,7 +37,7 @@ public interface MemberExperienceLogService { * @param pageReqVO 分页查询 * @return 会员经验记录分页 */ - PageResult getExperienceLogPage(MemberExperienceLogPageReqVO pageReqVO); + PageResult getExperienceLogPage(MemberExperienceRecordPageReqVO pageReqVO); /** * 创建 手动调整 经验变动记录 diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordServiceImpl.java similarity index 76% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogServiceImpl.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordServiceImpl.java index f049d308f..ca0b96b6d 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogServiceImpl.java +++ b/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; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; -import cn.iocoder.yudao.module.member.dal.mysql.level.MemberExperienceLogMapper; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO; +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberExperienceRecordMapper; import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -20,24 +20,24 @@ import java.util.List; */ @Service @Validated -public class MemberExperienceLogServiceImpl implements MemberExperienceLogService { +public class MemberExperienceRecordServiceImpl implements MemberExperienceRecordService { @Resource - private MemberExperienceLogMapper experienceLogMapper; + private MemberExperienceRecordMapper experienceLogMapper; @Override - public MemberExperienceLogDO getExperienceLog(Long id) { + public MemberExperienceRecordDO getExperienceLog(Long id) { return experienceLogMapper.selectById(id); } @Override - public List getExperienceLogList(Collection ids) { + public List getExperienceLogList(Collection ids) { return experienceLogMapper.selectBatchIds(ids); } @Override - public PageResult getExperienceLogPage(MemberExperienceLogPageReqVO pageReqVO) { + public PageResult getExperienceLogPage(MemberExperienceRecordPageReqVO pageReqVO) { return experienceLogMapper.selectPage(pageReqVO); } @@ -50,7 +50,7 @@ public class MemberExperienceLogServiceImpl implements MemberExperienceLogServic @Override public void createBizLog(Long userId, int experience, int totalExperience, MemberExperienceBizTypeEnum bizType, String bizId) { - MemberExperienceLogDO experienceLogDO = new MemberExperienceLogDO(); + MemberExperienceRecordDO experienceLogDO = new MemberExperienceRecordDO(); experienceLogDO.setUserId(userId); experienceLogDO.setExperience(experience); experienceLogDO.setTotalExperience(totalExperience); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java similarity index 84% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java index cfb84d684..7dfd2c830 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.member.service.level; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import java.util.Collection; @@ -14,7 +14,7 @@ import java.util.List; * * @author owen */ -public interface MemberLevelLogService { +public interface MemberLevelRecordService { /** * 删除会员等级记录 @@ -29,7 +29,7 @@ public interface MemberLevelLogService { * @param id 编号 * @return 会员等级记录 */ - MemberLevelLogDO getLevelLog(Long id); + MemberLevelRecordDO getLevelLog(Long id); /** * 获得会员等级记录列表 @@ -37,7 +37,7 @@ public interface MemberLevelLogService { * @param ids 编号 * @return 会员等级记录列表 */ - List getLevelLogList(Collection ids); + List getLevelLogList(Collection ids); /** * 获得会员等级记录分页 @@ -45,7 +45,7 @@ public interface MemberLevelLogService { * @param pageReqVO 分页查询 * @return 会员等级记录分页 */ - PageResult getLevelLogPage(MemberLevelLogPageReqVO pageReqVO); + PageResult getLevelLogPage(MemberLevelRecordPageReqVO pageReqVO); /** * 创建记录： 取消等级 diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordServiceImpl.java similarity index 81% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordServiceImpl.java index 2031c70fb..8a81dcf43 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordServiceImpl.java @@ -1,11 +1,11 @@ package cn.iocoder.yudao.module.member.service.level; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; -import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelLogMapper; +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelRecordMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -23,10 +23,10 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.LEVEL_LOG_ */ @Service @Validated -public class MemberLevelLogServiceImpl implements MemberLevelLogService { +public class MemberLevelRecordServiceImpl implements MemberLevelRecordService { @Resource - private MemberLevelLogMapper levelLogMapper; + private MemberLevelRecordMapper levelLogMapper; @Override public void deleteLevelLog(Long id) { @@ -43,23 +43,23 @@ public class MemberLevelLogServiceImpl implements MemberLevelLogService { } @Override - public MemberLevelLogDO getLevelLog(Long id) { + public MemberLevelRecordDO getLevelLog(Long id) { return levelLogMapper.selectById(id); } @Override - public List getLevelLogList(Collection ids) { + public List getLevelLogList(Collection ids) { return levelLogMapper.selectBatchIds(ids); } @Override - public PageResult getLevelLogPage(MemberLevelLogPageReqVO pageReqVO) { + public PageResult getLevelLogPage(MemberLevelRecordPageReqVO pageReqVO) { return levelLogMapper.selectPage(pageReqVO); } @Override public void createCancelLog(Long userId, String reason) { - MemberLevelLogDO levelLogDO = new MemberLevelLogDO(); + MemberLevelRecordDO levelLogDO = new MemberLevelRecordDO(); levelLogDO.setUserId(userId); levelLogDO.setRemark(reason); levelLogDO.setDescription("管理员取消"); @@ -71,7 +71,7 @@ public class MemberLevelLogServiceImpl implements MemberLevelLogService { @Override public void createAdjustLog(MemberUserDO user, MemberLevelDO level, int experience, String reason) { - MemberLevelLogDO levelLogDO = new MemberLevelLogDO(); + MemberLevelRecordDO levelLogDO = new MemberLevelRecordDO(); levelLogDO.setUserId(user.getId()); levelLogDO.setLevelId(level.getId()); levelLogDO.setLevel(level.getLevel()); @@ -88,7 +88,7 @@ public class MemberLevelLogServiceImpl implements MemberLevelLogService { @Override public void createAutoUpgradeLog(MemberUserDO user, MemberLevelDO level) { - MemberLevelLogDO levelLogDO = new MemberLevelLogDO(); + MemberLevelRecordDO levelLogDO = new MemberLevelRecordDO(); levelLogDO.setUserId(user.getId()); levelLogDO.setLevelId(level.getId()); levelLogDO.setLevel(level.getLevel()); @@ -102,7 +102,7 @@ public class MemberLevelLogServiceImpl implements MemberLevelLogService { notifyMember(user.getId(), levelLogDO); } - private void notifyMember(Long userId, MemberLevelLogDO level) { + private void notifyMember(Long userId, MemberLevelRecordDO level) { //todo: 给会员发消息 } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java index 71678d470..1364e7dbb 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java +++ b/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 { @Resource private MemberLevelMapper levelMapper; @Resource - private MemberLevelLogService memberLevelLogService; + private MemberLevelRecordService memberLevelRecordService; @Resource - private MemberExperienceLogService memberExperienceLogService; + private MemberExperienceRecordService memberExperienceRecordService; @Resource private MemberUserMapper memberUserMapper; @@ -203,7 +203,7 @@ public class MemberLevelServiceImpl implements MemberLevelService { experience = -user.getExperience(); // 取消了会员的等级 - memberLevelLogService.createCancelLog(user.getId(), updateReqVO.getReason()); + memberLevelRecordService.createCancelLog(user.getId(), updateReqVO.getReason()); memberUserMapper.updateUserLevelToNull(user.getId()); } else { MemberLevelDO level = validateLevelExists(updateReqVO.getLevelId()); @@ -212,7 +212,7 @@ public class MemberLevelServiceImpl implements MemberLevelService { // 会员当前的经验 = 等级的升级经验 totalExperience = level.getExperience(); - memberLevelLogService.createAdjustLog(user, level, experience, updateReqVO.getReason()); + memberLevelRecordService.createAdjustLog(user, level, experience, updateReqVO.getReason()); // 更新会员表上的等级编号、经验值 updateUserLevelIdAndExperience(user.getId(), updateReqVO.getLevelId(), totalExperience); @@ -220,7 +220,7 @@ public class MemberLevelServiceImpl implements MemberLevelService { // 记录会员经验变动 - memberExperienceLogService.createAdjustLog(user.getId(), experience, totalExperience); + memberExperienceRecordService.createAdjustLog(user.getId(), experience, totalExperience); } @Transactional(rollbackFor = Exception.class) @@ -239,7 +239,7 @@ public class MemberLevelServiceImpl implements MemberLevelService { int userExperience = NumberUtil.max(user.getExperience() + experience, 0); // 创建经验记录 - memberExperienceLogService.createBizLog(userId, experience, userExperience, bizType, bizId); + memberExperienceRecordService.createBizLog(userId, experience, userExperience, bizType, bizId); // 计算会员等级 Long levelId = calcLevel(user, userExperience); @@ -284,7 +284,7 @@ public class MemberLevelServiceImpl implements MemberLevelService { } // 保存等级变更记录 - memberLevelLogService.createAutoUpgradeLog(user, matchLevel); + memberLevelRecordService.createAutoUpgradeLog(user, matchLevel); return matchLevel.getId(); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java b/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java index e05dde443..9763c2f6f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java +++ b/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 { private MemberLevelMapper levelMapper; @MockBean - private MemberLevelLogService memberLevelLogService; + private MemberLevelRecordService memberLevelRecordService; @MockBean - private MemberExperienceLogService memberExperienceLogService; + private MemberExperienceRecordService memberExperienceRecordService; @Test public void testCreateLevel_success() { From dc382d80bb4a2460694f6e9657b17d0284c41e9d Mon Sep 17 00:00:00 2001 From: owen Date: Wed, 23 Aug 2023 10:02:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=9A=E5=91=98:=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A7=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/api/level/MemberLevelApi.java | 4 +- .../member/enums/ErrorCodeConstants.java | 1 + .../member/api/level/MemberLevelApiImpl.java | 14 +++- .../MemberExperienceRecordController.java | 4 +- .../level/MemberLevelRecordController.java | 4 +- .../level/MemberExperienceRecordConvert.java | 3 + .../level/MemberLevelRecordConvert.java | 10 +++ .../dataobject/level/MemberLevelRecordDO.java | 1 - .../dal/mysql/user/MemberUserMapper.java | 14 ---- .../level/MemberExperienceRecordService.java | 28 ++----- .../MemberExperienceRecordServiceImpl.java | 32 +++---- .../level/MemberLevelRecordService.java | 50 ++--------- .../level/MemberLevelRecordServiceImpl.java | 64 ++------------ .../service/level/MemberLevelService.java | 2 +- .../service/level/MemberLevelServiceImpl.java | 84 +++++++++++-------- .../service/user/MemberUserService.java | 8 ++ .../service/user/MemberUserServiceImpl.java | 12 +++ 17 files changed, 130 insertions(+), 205 deletions(-) diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java index 28ebef94e..b758633c8 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java +++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java @@ -14,8 +14,8 @@ public interface MemberLevelApi { * * @param userId 会员ID * @param experience 经验 - * @param bizType 业务类型 + * @param bizType 业务类型 {@link MemberExperienceBizTypeEnum} * @param bizId 业务编号 */ - void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId); + void plusExperience(Long userId, Integer experience, Integer bizType, String bizId); } diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java index c2278b136..b9df654f2 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java +++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java @@ -50,6 +50,7 @@ public interface ErrorCodeConstants { ErrorCode LEVEL_LOG_NOT_EXISTS = new ErrorCode(1004011100, "用户等级记录不存在"); ErrorCode EXPERIENCE_LOG_NOT_EXISTS = new ErrorCode(1004011200, "用户经验记录不存在"); + ErrorCode EXPERIENCE_BIZ_NOT_SUPPORT = new ErrorCode(1004011201, "用户经验业务类型不支持"); //========== 用户分组 1004012000 ========== ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1004012000, "用户分组不存在"); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java index 615539cef..c7c7f0d1e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java @@ -1,11 +1,16 @@ package cn.iocoder.yudao.module.member.api.level; +import cn.hutool.core.util.EnumUtil; import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; import cn.iocoder.yudao.module.member.service.level.MemberLevelService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.util.Objects; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.EXPERIENCE_BIZ_NOT_SUPPORT; /** * 会员等级 API 实现类 @@ -19,7 +24,12 @@ public class MemberLevelApiImpl implements MemberLevelApi { @Resource private MemberLevelService memberLevelService; - public void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) { - memberLevelService.plusExperience(userId, experience, bizType, bizId); + public void plusExperience(Long userId, Integer experience, Integer bizType, String bizId) { + MemberExperienceBizTypeEnum bizTypeEnum = EnumUtil.getBy(MemberExperienceBizTypeEnum.class, e -> Objects.equals(bizType, e.getValue())); + if (bizTypeEnum == null) { + throw exception(EXPERIENCE_BIZ_NOT_SUPPORT); + } + + memberLevelService.addExperience(userId, experience, bizTypeEnum, bizId); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java index 81c61df42..be3efc5ba 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java @@ -36,7 +36,7 @@ public class MemberExperienceRecordController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('member:experience-record:query')") public CommonResult getExperienceLog(@RequestParam("id") Long id) { - MemberExperienceRecordDO experienceLog = experienceLogService.getExperienceLog(id); + MemberExperienceRecordDO experienceLog = experienceLogService.getExperienceRecord(id); return success(MemberExperienceRecordConvert.INSTANCE.convert(experienceLog)); } @@ -44,7 +44,7 @@ public class MemberExperienceRecordController { @Operation(summary = "获得会员经验记录分页") @PreAuthorize("@ss.hasPermission('member:experience-record:query')") public CommonResult> getExperienceLogPage(@Valid MemberExperienceRecordPageReqVO pageVO) { - PageResult pageResult = experienceLogService.getExperienceLogPage(pageVO); + PageResult pageResult = experienceLogService.getExperienceRecordPage(pageVO); return success(MemberExperienceRecordConvert.INSTANCE.convertPage(pageResult)); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java index d81bf4893..4ee2f1a08 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java @@ -36,7 +36,7 @@ public class MemberLevelRecordController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('member:level-record:query')") public CommonResult getLevelLog(@RequestParam("id") Long id) { - MemberLevelRecordDO levelLog = levelLogService.getLevelLog(id); + MemberLevelRecordDO levelLog = levelLogService.getLevelRecord(id); return success(MemberLevelRecordConvert.INSTANCE.convert(levelLog)); } @@ -44,7 +44,7 @@ public class MemberLevelRecordController { @Operation(summary = "获得会员等级记录分页") @PreAuthorize("@ss.hasPermission('member:level-record:query')") public CommonResult> getLevelLogPage(@Valid MemberLevelRecordPageReqVO pageVO) { - PageResult pageResult = levelLogService.getLevelLogPage(pageVO); + PageResult pageResult = levelLogService.getLevelRecordPage(pageVO); return success(MemberLevelRecordConvert.INSTANCE.convertPage(pageResult)); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java index 6902fccfd..cd51ba50e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java @@ -24,4 +24,7 @@ public interface MemberExperienceRecordConvert { PageResult convertPage(PageResult page); + MemberExperienceRecordDO convert(Long userId, Integer experience, Integer totalExperience, + String bizId, Integer bizType, + String title, String description); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java index 3770cc3d4..406e037c8 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.member.convert.level; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordRespVO; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -24,4 +25,13 @@ public interface MemberLevelRecordConvert { PageResult convertPage(PageResult page); + default MemberLevelRecordDO copyTo(MemberLevelDO from, MemberLevelRecordDO to) { + if (from != null) { + to.setLevelId(from.getId()); + to.setLevel(from.getLevel()); + to.setDiscount(from.getDiscount()); + to.setExperience(from.getExperience()); + } + return to; + } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java index b341daf00..289dae983 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java @@ -52,7 +52,6 @@ public class MemberLevelRecordDO extends BaseDO { * 会员此时的经验 */ private Integer userExperience; - // TODO @疯狂：是不是 remark 和 description 可以合并成 description 就够了 /** * 备注 */ diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java index 630c7a989..902057272 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java @@ -7,7 +7,6 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -50,19 +49,6 @@ public interface MemberUserMapper extends BaseMapperX { .orderByDesc(MemberUserDO::getId)); } - /** - * 取消会员的等级 - * - * @param userId 会员编号 - * @return 受影响的行数 - */ - default int updateUserLevelToNull(Long userId) { - return update(null, new LambdaUpdateWrapper() - .eq(MemberUserDO::getId, userId) - .set(MemberUserDO::getExperience, 0) - .set(MemberUserDO::getLevelId, null)); - } - default Long selectCountByGroupId(Long groupId) { return selectCount(MemberUserDO::getGroupId, groupId); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java index 56efbb3f9..b06464c28 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java @@ -21,7 +21,7 @@ public interface MemberExperienceRecordService { * @param id 编号 * @return 会员经验记录 */ - MemberExperienceRecordDO getExperienceLog(Long id); + MemberExperienceRecordDO getExperienceRecord(Long id); /** * 获得会员经验记录列表 @@ -29,7 +29,7 @@ public interface MemberExperienceRecordService { * @param ids 编号 * @return 会员经验记录列表 */ - List getExperienceLogList(Collection ids); + List getExperienceRecordList(Collection ids); /** * 获得会员经验记录分页 @@ -37,26 +37,7 @@ public interface MemberExperienceRecordService { * @param pageReqVO 分页查询 * @return 会员经验记录分页 */ - PageResult getExperienceLogPage(MemberExperienceRecordPageReqVO pageReqVO); - - /** - * 获得会员经验记录列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 会员经验记录列表 - */ - List getExperienceLogList(MemberExperienceLogExportReqVO exportReqVO); - - // TODO @疯狂：类似 MemberLevelLogService 的方法，这里也需要提供一个通用的方法，用于创建经验变动记录 - - /** - * 创建 手动调整 经验变动记录 - * - * @param userId 会员编号 - * @param experience 变动经验值 - * @param totalExperience 会员当前的经验 - */ - void createAdjustLog(Long userId, int experience, int totalExperience); + PageResult getExperienceRecordPage(MemberExperienceRecordPageReqVO pageReqVO); /** * 根据业务类型, 创建 经验变动记录 @@ -67,5 +48,6 @@ public interface MemberExperienceRecordService { * @param bizType 业务类型 * @param bizId 业务ID */ - void createBizLog(Long userId, int experience, int totalExperience, MemberExperienceBizTypeEnum bizType, String bizId); + void createExperienceRecord(Long userId, Integer experience, Integer totalExperience, + MemberExperienceBizTypeEnum bizType, String bizId); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordServiceImpl.java index ca0b96b6d..9653928a4 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordServiceImpl.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.service.level; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO; +import cn.iocoder.yudao.module.member.convert.level.MemberExperienceRecordConvert; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO; import cn.iocoder.yudao.module.member.dal.mysql.level.MemberExperienceRecordMapper; import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; @@ -27,38 +28,29 @@ public class MemberExperienceRecordServiceImpl implements MemberExperienceRecord @Override - public MemberExperienceRecordDO getExperienceLog(Long id) { + public MemberExperienceRecordDO getExperienceRecord(Long id) { return experienceLogMapper.selectById(id); } @Override - public List getExperienceLogList(Collection ids) { + public List getExperienceRecordList(Collection ids) { return experienceLogMapper.selectBatchIds(ids); } @Override - public PageResult getExperienceLogPage(MemberExperienceRecordPageReqVO pageReqVO) { + public PageResult getExperienceRecordPage(MemberExperienceRecordPageReqVO pageReqVO) { return experienceLogMapper.selectPage(pageReqVO); } @Override - public void createAdjustLog(Long userId, int experience, int totalExperience) { - // 管理员调整时, 没有业务编号, 记录对应的枚举值 - String bizId = MemberExperienceBizTypeEnum.ADMIN.getValue() + ""; - this.createBizLog(userId, experience, totalExperience, MemberExperienceBizTypeEnum.ADMIN, bizId); - } - - @Override - public void createBizLog(Long userId, int experience, int totalExperience, MemberExperienceBizTypeEnum bizType, String bizId) { - MemberExperienceRecordDO experienceLogDO = new MemberExperienceRecordDO(); - experienceLogDO.setUserId(userId); - experienceLogDO.setExperience(experience); - experienceLogDO.setTotalExperience(totalExperience); - experienceLogDO.setBizId(bizId); - experienceLogDO.setBizType(bizType.getValue()); - experienceLogDO.setTitle(bizType.getTitle()); - experienceLogDO.setDescription(StrUtil.format(bizType.getDesc(), experience)); - experienceLogMapper.insert(experienceLogDO); + public void createExperienceRecord(Long userId, Integer experience, Integer totalExperience, + MemberExperienceBizTypeEnum bizType, String bizId) { + String description = StrUtil.format(bizType.getDesc(), experience); + MemberExperienceRecordDO recordDO = MemberExperienceRecordConvert.INSTANCE.convert(userId, + experience, totalExperience, + bizId, bizType.getValue(), bizType.getTitle(), + description); + experienceLogMapper.insert(recordDO); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java index 7cc2dd359..cdee7ddc7 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java @@ -2,9 +2,7 @@ package cn.iocoder.yudao.module.member.service.level; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO; -import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import java.util.Collection; import java.util.List; @@ -16,20 +14,13 @@ import java.util.List; */ public interface MemberLevelRecordService { - /** - * 删除会员等级记录 - * - * @param id 编号 - */ - void deleteLevelLog(Long id); - /** * 获得会员等级记录 * * @param id 编号 * @return 会员等级记录 */ - MemberLevelRecordDO getLevelLog(Long id); + MemberLevelRecordDO getLevelRecord(Long id); /** * 获得会员等级记录列表 @@ -37,7 +28,7 @@ public interface MemberLevelRecordService { * @param ids 编号 * @return 会员等级记录列表 */ - List getLevelLogList(Collection ids); + List getLevelRecordList(Collection ids); /** * 获得会员等级记录分页 @@ -45,41 +36,12 @@ public interface MemberLevelRecordService { * @param pageReqVO 分页查询 * @return 会员等级记录分页 */ - PageResult getLevelLogPage(MemberLevelRecordPageReqVO pageReqVO); + PageResult getLevelRecordPage(MemberLevelRecordPageReqVO pageReqVO); /** - * 获得会员等级记录列表, 用于 Excel 导出 + * 创建会员等级记录 * - * @param exportReqVO 查询条件 - * @return 会员等级记录列表 + * @param levelRecord 会员等级记录 */ - List getLevelLogList(MemberLevelLogExportReqVO exportReqVO); - - // TODO @疯狂：把 createCancelLog、createAdjustLog、createAutoUpgradeLog 几个日志合并成一个通用的日志方法；整体的内容，交给 MemberLevelService 去做；以及对应的 level 变化的通知； - - /** - * 创建记录： 取消等级 - * - * @param userId 会员编号 - * @param reason 调整原因 - */ - void createCancelLog(Long userId, String reason); - - /** - * 创建记录： 手动调整 - * - * @param user 会员 - * @param level 等级 - * @param experience 变动经验值 - * @param reason 调整原因 - */ - void createAdjustLog(MemberUserDO user, MemberLevelDO level, int experience, String reason); - - /** - * 创建记录： 自动升级 - * - * @param user 会员 - * @param level 等级 - */ - void createAutoUpgradeLog(MemberUserDO user, MemberLevelDO level); + void createLevelRecord(MemberLevelRecordDO levelRecord); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordServiceImpl.java index 8a81dcf43..83926cd98 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordServiceImpl.java @@ -2,9 +2,7 @@ package cn.iocoder.yudao.module.member.service.level; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO; -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO; -import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelRecordMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -28,14 +26,6 @@ public class MemberLevelRecordServiceImpl implements MemberLevelRecordService { @Resource private MemberLevelRecordMapper levelLogMapper; - @Override - public void deleteLevelLog(Long id) { - // 校验存在 - validateLevelLogExists(id); - // 删除 - levelLogMapper.deleteById(id); - } - private void validateLevelLogExists(Long id) { if (levelLogMapper.selectById(id) == null) { throw exception(LEVEL_LOG_NOT_EXISTS); @@ -43,67 +33,23 @@ public class MemberLevelRecordServiceImpl implements MemberLevelRecordService { } @Override - public MemberLevelRecordDO getLevelLog(Long id) { + public MemberLevelRecordDO getLevelRecord(Long id) { return levelLogMapper.selectById(id); } @Override - public List getLevelLogList(Collection ids) { + public List getLevelRecordList(Collection ids) { return levelLogMapper.selectBatchIds(ids); } @Override - public PageResult getLevelLogPage(MemberLevelRecordPageReqVO pageReqVO) { + public PageResult getLevelRecordPage(MemberLevelRecordPageReqVO pageReqVO) { return levelLogMapper.selectPage(pageReqVO); } @Override - public void createCancelLog(Long userId, String reason) { - MemberLevelRecordDO levelLogDO = new MemberLevelRecordDO(); - levelLogDO.setUserId(userId); - levelLogDO.setRemark(reason); - levelLogDO.setDescription("管理员取消"); - levelLogMapper.insert(levelLogDO); - - // 给会员发送等级变动消息 - notifyMember(userId, levelLogDO); - } - - @Override - public void createAdjustLog(MemberUserDO user, MemberLevelDO level, int experience, String reason) { - MemberLevelRecordDO levelLogDO = new MemberLevelRecordDO(); - levelLogDO.setUserId(user.getId()); - levelLogDO.setLevelId(level.getId()); - levelLogDO.setLevel(level.getLevel()); - levelLogDO.setDiscount(level.getDiscount()); - levelLogDO.setUserExperience(level.getExperience()); - levelLogDO.setExperience(experience); - levelLogDO.setRemark(reason); - levelLogDO.setDescription("管理员调整为：" + level.getName()); - levelLogMapper.insert(levelLogDO); - - // 给会员发送等级变动消息 - notifyMember(user.getId(), levelLogDO); - } - - @Override - public void createAutoUpgradeLog(MemberUserDO user, MemberLevelDO level) { - MemberLevelRecordDO levelLogDO = new MemberLevelRecordDO(); - levelLogDO.setUserId(user.getId()); - levelLogDO.setLevelId(level.getId()); - levelLogDO.setLevel(level.getLevel()); - levelLogDO.setDiscount(level.getDiscount()); - levelLogDO.setExperience(level.getExperience()); - levelLogDO.setUserExperience(user.getExperience()); - levelLogDO.setDescription("成为：" + level.getName()); - levelLogMapper.insert(levelLogDO); - - // 给会员发送等级变动消息 - notifyMember(user.getId(), levelLogDO); - } - - private void notifyMember(Long userId, MemberLevelRecordDO level) { - //todo: 给会员发消息 + public void createLevelRecord(MemberLevelRecordDO levelRecord) { + levelLogMapper.insert(levelRecord); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java index e604435a3..e59e205c9 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java @@ -100,5 +100,5 @@ public interface MemberLevelService { * @param bizType 业务类型 * @param bizId 业务编号 */ - void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId); + void addExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java index dd6815bac..1cc7f474c 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java @@ -10,11 +10,14 @@ import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLeve import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO; import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert; +import cn.iocoder.yudao.module.member.convert.level.MemberLevelRecordConvert; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper; import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; +import cn.iocoder.yudao.module.member.service.user.MemberUserService; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -47,6 +50,8 @@ public class MemberLevelServiceImpl implements MemberLevelService { private MemberExperienceRecordService memberExperienceRecordService; @Resource private MemberUserMapper memberUserMapper; + @Resource + private MemberUserService memberUserService; @Override public Long createLevel(MemberLevelCreateReqVO createReqVO) { @@ -189,68 +194,73 @@ public class MemberLevelServiceImpl implements MemberLevelService { return; } - int experience; - int totalExperience = 0; - // 记录等级变动 + MemberLevelRecordDO levelRecord = new MemberLevelRecordDO() + .setUserId(user.getId()) + .setRemark(updateReqVO.getReason()); + MemberLevelDO memberLevel = null; if (updateReqVO.getLevelId() == null) { // 取消用户等级时，为扣减经验 - experience = -user.getExperience(); - - // 取消了会员的等级 - memberLevelRecordService.createCancelLog(user.getId(), updateReqVO.getReason()); - memberUserMapper.updateUserLevelToNull(user.getId()); + levelRecord.setExperience(-user.getExperience()); + levelRecord.setDescription("管理员取消了等级"); } else { - MemberLevelDO level = validateLevelExists(updateReqVO.getLevelId()); + memberLevel = validateLevelExists(updateReqVO.getLevelId()); + // 复制等级配置 + MemberLevelRecordConvert.INSTANCE.copyTo(memberLevel, levelRecord); // 变动经验值 = 等级的升级经验 - 会员当前的经验；正数为增加经验，负数为扣减经验 - experience = level.getExperience() - user.getExperience(); + levelRecord.setExperience(memberLevel.getExperience() - user.getExperience()); // 会员当前的经验 = 等级的升级经验 - totalExperience = level.getExperience(); - - memberLevelRecordService.createAdjustLog(user, level, experience, updateReqVO.getReason()); - - // 更新会员表上的等级编号、经验值 - updateUserLevelIdAndExperience(user.getId(), updateReqVO.getLevelId(), totalExperience); + levelRecord.setUserExperience(memberLevel.getExperience()); + levelRecord.setDescription("管理员调整为：" + memberLevel.getName()); } + // 记录等级变动 + memberLevelRecordService.createLevelRecord(levelRecord); + // 记录会员经验变动 - memberExperienceRecordService.createAdjustLog(user.getId(), experience, totalExperience); + memberExperienceRecordService.createExperienceRecord(user.getId(), + levelRecord.getExperience(), levelRecord.getUserExperience(), + MemberExperienceBizTypeEnum.ADMIN, MemberExperienceBizTypeEnum.ADMIN.getValue() + ""); + + // 更新会员表上的等级编号、经验值 + memberUserService.updateLevelIdAndExperience(user.getId(), updateReqVO.getLevelId(), levelRecord.getUserExperience()); + + // 给会员发送等级变动消息 + notifyMemberLevelChange(user.getId(), memberLevel); } - // TODO @疯狂：方法名，建议改成 increase 或者 add 经验，和项目更统一一些 - // TODO @疯狂：bizType 改成具体数值，主要是枚举在 api 不好传递，rpc 情况下 @Override @Transactional(rollbackFor = Exception.class) - public void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) { + public void addExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) { if (experience == 0) { return; } MemberUserDO user = memberUserMapper.selectById(userId); - // 防止扣出负数 int userExperience = NumberUtil.max(user.getExperience() + experience, 0); + MemberLevelRecordDO levelRecord = new MemberLevelRecordDO() + .setUserId(user.getId()) + .setExperience(experience) + // 防止扣出负数 + .setUserExperience(userExperience); + // 创建经验记录 - memberExperienceRecordService.createBizLog(userId, experience, userExperience, bizType, bizId); + memberExperienceRecordService.createExperienceRecord(userId, experience, userExperience, + bizType, bizId); // 计算会员等级 MemberLevelDO newLevel = calculateNewLevel(user, userExperience); - Long newLevelId = null; if (newLevel != null) { - newLevelId = newLevel.getId(); + // 复制等级配置 + MemberLevelRecordConvert.INSTANCE.copyTo(newLevel, levelRecord); // 保存等级变更记录 - memberLevelRecordService.createAutoUpgradeLog(user, newLevel); + memberLevelRecordService.createLevelRecord(levelRecord); + // 给会员发送等级变动消息 + notifyMemberLevelChange(userId, newLevel); } // 更新会员表上的等级编号、经验值 - updateUserLevelIdAndExperience(user.getId(), newLevelId, userExperience); - } - - // TODO @疯狂：让 memberUserService 那开个方法；每个模块，不直接操作对方的 mapper； - private void updateUserLevelIdAndExperience(Long userId, Long levelId, Integer experience) { - memberUserMapper.updateById(new MemberUserDO() - .setId(userId) - .setLevelId(levelId).setExperience(experience) - ); + memberUserService.updateLevelIdAndExperience(user.getId(), levelRecord.getLevelId(), userExperience); } /** @@ -258,7 +268,7 @@ public class MemberLevelServiceImpl implements MemberLevelService { * * @param user 会员 * @param userExperience 会员当前的经验值 - * @return 会员等级编号，null表示无变化 + * @return 会员新的等级，null表示无变化 */ private MemberLevelDO calculateNewLevel(MemberUserDO user, int userExperience) { List list = getEnableLevelList(); @@ -283,4 +293,8 @@ public class MemberLevelServiceImpl implements MemberLevelService { return matchLevel; } + + private void notifyMemberLevelChange(Long userId, MemberLevelDO level) { + //todo: 给会员发消息 + } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java index b48acc0d1..8b7d7460a 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java @@ -126,4 +126,12 @@ public interface MemberUserService { */ PageResult getUserPage(MemberUserPageReqVO pageReqVO); + /** + * 更新用户的等级和经验 + * + * @param id 用户编号 + * @param levelId 用户等级 + * @param experience 用户经验 + */ + void updateLevelIdAndExperience(Long id, Long levelId, Integer experience); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index 421cf5b90..c2918fd39 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -228,4 +228,16 @@ public class MemberUserServiceImpl implements MemberUserService { return memberUserMapper.selectPage(pageReqVO); } + @Override + public void updateLevelIdAndExperience(Long id, Long levelId, Integer experience) { + if (levelId == null) { + // 0 代表无等级：防止UpdateById时，会被过滤掉的问题 + levelId = 0L; + } + memberUserMapper.updateById(new MemberUserDO() + .setId(id) + .setLevelId(levelId).setExperience(experience) + ); + } + } From 4132cf14371289628375102955e588cb3c096898 Mon Sep 17 00:00:00 2001 From: owen Date: Wed, 23 Aug 2023 10:12:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=9A=E5=91=98:=20=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=8F=96=E6=B6=88=E5=88=86=E9=A1=B5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/level/MemberLevelController.java | 12 +++++------- ...evelPageReqVO.java => MemberLevelListReqVO.java} | 5 +---- .../member/convert/level/MemberLevelConvert.java | 3 --- .../member/dal/mysql/level/MemberLevelMapper.java | 7 +++---- .../member/service/level/MemberLevelService.java | 11 +++++------ .../service/level/MemberLevelServiceImpl.java | 7 +++---- .../service/level/MemberLevelServiceImplTest.java | 13 ++++++------- 7 files changed, 23 insertions(+), 35 deletions(-) rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/{MemberLevelPageReqVO.java => MemberLevelListReqVO.java} (71%) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java index af4153b22..5a031321f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.member.controller.admin.level; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.*; import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; @@ -70,13 +69,12 @@ public class MemberLevelController { return success(MemberLevelConvert.INSTANCE.convertSimpleList(list)); } - // TODO @疯狂：是不是不做分页，直接 list 就好啦；返回的时候，按照经验排序下哈； - @GetMapping("/page") - @Operation(summary = "获得会员等级分页") + @GetMapping("/list") + @Operation(summary = "获得会员等级列表") @PreAuthorize("@ss.hasPermission('member:level:query')") - public CommonResult> getLevelPage(@Valid MemberLevelPageReqVO pageVO) { - PageResult pageResult = levelService.getLevelPage(pageVO); - return success(MemberLevelConvert.INSTANCE.convertPage(pageResult)); + public CommonResult> getLevelList(@Valid MemberLevelListReqVO pageVO) { + List result = levelService.getLevelList(pageVO); + return success(MemberLevelConvert.INSTANCE.convertList(result)); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java similarity index 71% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelPageReqVO.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java index d9a6b5b66..87502b278 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelPageReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java @@ -1,16 +1,13 @@ package cn.iocoder.yudao.module.member.controller.admin.level.vo.level; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.ToString; @Schema(description = "管理后台 - 会员等级分页 Request VO") @Data -@EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MemberLevelPageReqVO extends PageParam { +public class MemberLevelListReqVO { @Schema(description = "等级名称", example = "芋艿") private String name; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java index ec2549462..4788bf365 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.member.convert.level; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelRespVO; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelSimpleRespVO; @@ -29,7 +28,5 @@ public interface MemberLevelConvert { List convertList(List list); - PageResult convertPage(PageResult page); - List convertSimpleList(List list); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelMapper.java index b0eb77d12..a7be2fd64 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelMapper.java @@ -1,9 +1,8 @@ package cn.iocoder.yudao.module.member.dal.mysql.level; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelListReqVO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; import org.apache.ibatis.annotations.Mapper; @@ -17,8 +16,8 @@ import java.util.List; @Mapper public interface MemberLevelMapper extends BaseMapperX { - default PageResult selectPage(MemberLevelPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + default List selectList(MemberLevelListReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() .likeIfPresent(MemberLevelDO::getName, reqVO.getName()) .eqIfPresent(MemberLevelDO::getStatus, reqVO.getStatus()) .orderByAsc(MemberLevelDO::getLevel)); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java index e59e205c9..11c75cd65 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java @@ -1,9 +1,8 @@ package cn.iocoder.yudao.module.member.service.level; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelListReqVO; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; @@ -59,12 +58,12 @@ public interface MemberLevelService { List getLevelList(Collection ids); /** - * 获得会员等级分页 + * 获得会员等级列表 * - * @param pageReqVO 分页查询 - * @return 会员等级分页 + * @param listReqVO 查询参数 + * @return 会员等级列表 */ - PageResult getLevelPage(MemberLevelPageReqVO pageReqVO); + List getLevelList(MemberLevelListReqVO listReqVO); /** diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java index 1cc7f474c..6120b711a 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java @@ -4,9 +4,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjectUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelListReqVO; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO; import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert; @@ -173,8 +172,8 @@ public class MemberLevelServiceImpl implements MemberLevelService { } @Override - public PageResult getLevelPage(MemberLevelPageReqVO pageReqVO) { - return levelMapper.selectPage(pageReqVO); + public List getLevelList(MemberLevelListReqVO listReqVO) { + return levelMapper.selectList(listReqVO); } @Override diff --git a/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java b/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java index 9763c2f6f..abcf5ff8d 100644 --- a/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java +++ b/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; -import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelListReqVO; import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper; @@ -121,7 +121,7 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest { } @Test - public void testGetLevelPage() { + public void testGetLevelList() { // mock 数据 MemberLevelDO dbLevel = randomPojo(MemberLevelDO.class, o -> { // 等会查询到 o.setName("黄金会员"); @@ -133,16 +133,15 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest { // 测试 status 不匹配 levelMapper.insert(cloneIgnoreId(dbLevel, o -> o.setStatus(0))); // 准备参数 - MemberLevelPageReqVO reqVO = new MemberLevelPageReqVO(); + MemberLevelListReqVO reqVO = new MemberLevelListReqVO(); reqVO.setName("黄金会员"); reqVO.setStatus(1); // 调用 - PageResult pageResult = levelService.getLevelPage(reqVO); + List list = levelService.getLevelList(reqVO); // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbLevel, pageResult.getList().get(0)); + assertEquals(1, list.size()); + assertPojoEquals(dbLevel, list.get(0)); } @Test From da8b2eab6da53da5a8eaa05af53561aad159f210 Mon Sep 17 00:00:00 2001 From: owen Date: Wed, 23 Aug 2023 10:24:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/member_level.sql | 58 +++++++++---------- .../level/MemberLevelRecordConvert.java | 2 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/sql/mysql/member_level.sql b/sql/mysql/member_level.sql index 50008e990..c7a02bbb0 100644 --- a/sql/mysql/member_level.sql +++ b/sql/mysql/member_level.sql @@ -5,40 +5,40 @@ alter table member_user add column level_id bigint comment '等级编号'; -- 增加3张表 create table member_level ( - id bigint auto_increment comment '编号' primary key, - name varchar(30) default '' not null comment '等级名称', - experience int default 0 not null comment '升级经验', - level int default 0 not null comment '等级', - discount tinyint default 100 not null comment '享受折扣', - icon varchar(255) default '' not null comment '等级图标', - background_url varchar(255) default '' not null comment '等级背景图', - status tinyint default 0 not null comment '状态', - creator varchar(64) default '' null comment '创建者', - create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间', - updater varchar(64) default '' null comment '更新者', - update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间', - deleted bit default b'0' not null comment '是否删除', - tenant_id bigint default 0 not null comment '租户编号' + id bigint auto_increment comment '编号' primary key, + name varchar(30) default '' not null comment '等级名称', + experience int default 0 not null comment '升级经验', + level int default 0 not null comment '等级', + discount_percent tinyint default 100 not null comment '享受折扣', + icon varchar(255) default '' not null comment '等级图标', + background_url varchar(255) default '' not null comment '等级背景图', + status tinyint default 0 not null comment '状态', + creator varchar(64) default '' null comment '创建者', + create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间', + updater varchar(64) default '' null comment '更新者', + update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间', + deleted bit default b'0' not null comment '是否删除', + tenant_id bigint default 0 not null comment '租户编号' ) comment '会员等级'; create table member_level_record ( - id bigint auto_increment comment '编号' primary key, - user_id bigint default 0 not null comment '用户编号', - level_id bigint default 0 not null comment '等级编号', - level int default 0 not null comment '会员等级', - discount tinyint default 100 not null comment '享受折扣', - experience int default 0 not null comment '升级经验', - user_experience int default 0 not null comment '会员此时的经验', - remark varchar(255) default '' not null comment '备注', - description varchar(255) default '' not null comment '描述', - creator varchar(64) default '' null comment '创建者', - create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间', - updater varchar(64) default '' null comment '更新者', - update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间', - deleted bit default b'0' not null comment '是否删除', - tenant_id bigint default 0 not null comment '租户编号' + id bigint auto_increment comment '编号' primary key, + user_id bigint default 0 not null comment '用户编号', + level_id bigint default 0 not null comment '等级编号', + level int default 0 not null comment '会员等级', + discount_percent tinyint default 100 not null comment '享受折扣', + experience int default 0 not null comment '升级经验', + user_experience int default 0 not null comment '会员此时的经验', + remark varchar(255) default '' not null comment '备注', + description varchar(255) default '' not null comment '描述', + creator varchar(64) default '' null comment '创建者', + create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间', + updater varchar(64) default '' null comment '更新者', + update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间', + deleted bit default b'0' not null comment '是否删除', + tenant_id bigint default 0 not null comment '租户编号' ) comment '会员等级记录'; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java index 406e037c8..9c167930c 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java @@ -29,7 +29,7 @@ public interface MemberLevelRecordConvert { if (from != null) { to.setLevelId(from.getId()); to.setLevel(from.getLevel()); - to.setDiscount(from.getDiscount()); + to.setDiscountPercent(from.getDiscountPercent()); to.setExperience(from.getExperience()); } return to;