Commit 4cd5b5712b12b01e6dc800a0707a31899336de70
Committed by
Gitee
!577 会员:修改会员标签名称唯一校验逻辑
Merge pull request !577 from 疯狂的世界/member_dev
Showing
56 changed files
with
2534 additions
and
16 deletions
sql/mysql/member_level.sql
0 → 100644
| 1 | +-- 会员表增加字段 | |
| 2 | +alter table member_user add column experience int not null default 0 comment '经验'; | |
| 3 | +alter table member_user add column level_id bigint comment '等级编号'; | |
| 4 | + | |
| 5 | +-- 增加3张表 | |
| 6 | +create table member_level | |
| 7 | +( | |
| 8 | + id bigint auto_increment comment '编号' primary key, | |
| 9 | + name varchar(30) default '' not null comment '等级名称', | |
| 10 | + experience int default 0 not null comment '升级经验', | |
| 11 | + level int default 0 not null comment '等级', | |
| 12 | + discount tinyint default 100 not null comment '享受折扣', | |
| 13 | + icon varchar(255) default '' not null comment '等级图标', | |
| 14 | + background_url varchar(255) default '' not null comment '等级背景图', | |
| 15 | + status tinyint default 0 not null comment '状态', | |
| 16 | + creator varchar(64) default '' null comment '创建者', | |
| 17 | + create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间', | |
| 18 | + updater varchar(64) default '' null comment '更新者', | |
| 19 | + update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间', | |
| 20 | + deleted bit default b'0' not null comment '是否删除', | |
| 21 | + tenant_id bigint default 0 not null comment '租户编号' | |
| 22 | +) | |
| 23 | + comment '会员等级'; | |
| 24 | + | |
| 25 | +create table member_level_log | |
| 26 | +( | |
| 27 | + id bigint auto_increment comment '编号' primary key, | |
| 28 | + user_id bigint default 0 not null comment '用户编号', | |
| 29 | + level_id bigint default 0 not null comment '等级编号', | |
| 30 | + level int default 0 not null comment '会员等级', | |
| 31 | + discount tinyint default 100 not null comment '享受折扣', | |
| 32 | + experience int default 0 not null comment '升级经验', | |
| 33 | + user_experience int default 0 not null comment '会员此时的经验', | |
| 34 | + remark varchar(255) default '' not null comment '备注', | |
| 35 | + description varchar(255) default '' not null comment '描述', | |
| 36 | + creator varchar(64) default '' null comment '创建者', | |
| 37 | + create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间', | |
| 38 | + updater varchar(64) default '' null comment '更新者', | |
| 39 | + update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间', | |
| 40 | + deleted bit default b'0' not null comment '是否删除', | |
| 41 | + tenant_id bigint default 0 not null comment '租户编号' | |
| 42 | +) | |
| 43 | + comment '会员等级记录'; | |
| 44 | + | |
| 45 | +create index idx_user_id on member_level_log (user_id) comment '会员等级记录-用户编号'; | |
| 46 | + | |
| 47 | +create table member_experience_log | |
| 48 | +( | |
| 49 | + id bigint auto_increment comment '编号' primary key, | |
| 50 | + user_id bigint default 0 not null comment '用户编号', | |
| 51 | + biz_id varchar(64) default '' not null comment '业务编号', | |
| 52 | + biz_type tinyint default 0 not null comment '业务类型', | |
| 53 | + title varchar(30) default '' not null comment '标题', | |
| 54 | + experience int default 0 not null comment '经验', | |
| 55 | + total_experience int default 0 not null comment '变更后的经验', | |
| 56 | + description varchar(512) default '' not null comment '描述', | |
| 57 | + creator varchar(64) default '' null comment '创建者', | |
| 58 | + create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间', | |
| 59 | + updater varchar(64) default '' null comment '更新者', | |
| 60 | + update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间', | |
| 61 | + deleted bit default b'0' not null comment '是否删除', | |
| 62 | + tenant_id bigint default 0 not null comment '租户编号' | |
| 63 | +) | |
| 64 | + comment '会员经验记录'; | |
| 65 | + | |
| 66 | +create index idx_user_id on member_experience_log (user_id) comment '会员经验记录-用户编号'; | |
| 67 | +create index idx_user_biz_type on member_experience_log (user_id, biz_type) comment '会员经验记录-用户业务类型'; | |
| 68 | + | |
| 69 | +-- 增加字典 | |
| 70 | +insert system_dict_type(name, type) values ('会员经验业务类型', 'member_experience_biz_type'); | |
| 71 | +insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '管理员调整', '0', 0); | |
| 72 | +insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '邀新奖励', '1', 1); | |
| 73 | +insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '下单奖励', '2', 2); | |
| 74 | +insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '退单扣除', '3', 3); | |
| 75 | +insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '签到奖励', '4', 4); | |
| 76 | +insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '抽奖奖励', '5', 5); | |
| 77 | + | |
| 78 | +-- 菜单 SQL | |
| 79 | +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name) | |
| 80 | +VALUES ('会员等级', '', 2, 3, 2262, 'level', '', 'member/level/index', 0, 'MemberLevel'); | |
| 81 | + | |
| 82 | +-- 按钮父菜单ID | |
| 83 | +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话,需要手动修改 @parentId 的部分的代码 | |
| 84 | +SELECT @parentId := LAST_INSERT_ID(); | |
| 85 | + | |
| 86 | +-- 按钮 SQL | |
| 87 | +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status) | |
| 88 | +VALUES ('会员等级查询', 'member:level:query', 3, 1, @parentId, '', '', '', 0); | |
| 89 | +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status) | |
| 90 | +VALUES ('会员等级创建', 'member:level:create', 3, 2, @parentId, '', '', '', 0); | |
| 91 | +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status) | |
| 92 | +VALUES ('会员等级更新', 'member:level:update', 3, 3, @parentId, '', '', '', 0); | |
| 93 | +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status) | |
| 94 | +VALUES ('会员等级删除', 'member:level:delete', 3, 4, @parentId, '', '', '', 0); | ... | ... |
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.api.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; | |
| 4 | + | |
| 5 | +/** | |
| 6 | + * 会员等级 API接口 | |
| 7 | + * | |
| 8 | + * @author owen | |
| 9 | + */ | |
| 10 | +public interface MemberLevelApi { | |
| 11 | + | |
| 12 | + /** | |
| 13 | + * 增加会员经验 | |
| 14 | + * | |
| 15 | + * @param userId 会员ID | |
| 16 | + * @param experience 经验 | |
| 17 | + * @param bizType 业务类型 | |
| 18 | + * @param bizId 业务编号 | |
| 19 | + */ | |
| 20 | + void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId); | |
| 21 | +} | ... | ... |
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/DictTypeConstants.java
0 → 100644
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
| ... | ... | @@ -38,4 +38,15 @@ public interface ErrorCodeConstants { |
| 38 | 38 | |
| 39 | 39 | //========== 签到配置 1004010000 ========== |
| 40 | 40 | |
| 41 | + | |
| 42 | + //========== 会员等级 1004007000 ========== | |
| 43 | + ErrorCode LEVEL_NOT_EXISTS = new ErrorCode(1004007000, "会员等级不存在"); | |
| 44 | + ErrorCode LEVEL_NAME_EXISTS = new ErrorCode(1004007001, "会员等级名称[{}]已被使用"); | |
| 45 | + ErrorCode LEVEL_VALUE_EXISTS = new ErrorCode(1004007002, "会员等级值[{}]已被[{}]使用"); | |
| 46 | + ErrorCode LEVEL_EXPERIENCE_MIN = new ErrorCode(1004007003, "升级经验必须大于上一个等级[{}]设置的升级经验[{}]"); | |
| 47 | + ErrorCode LEVEL_EXPERIENCE_MAX = new ErrorCode(1004007004, "升级经验必须小于下一个等级[{}]设置的升级经验[{}]"); | |
| 48 | + | |
| 49 | + ErrorCode LEVEL_LOG_NOT_EXISTS = new ErrorCode(1004007100, "会员等级记录不存在"); | |
| 50 | + ErrorCode EXPERIENCE_LOG_NOT_EXISTS = new ErrorCode(1004007200, "会员经验记录不存在"); | |
| 51 | + ErrorCode LEVEL_REASON_NOT_EXISTS = new ErrorCode(1004007300, "会员等级调整原因不能为空"); | |
| 41 | 52 | } | ... | ... |
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/MemberExperienceBizTypeEnum.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.enums; | |
| 2 | + | |
| 3 | +import lombok.AllArgsConstructor; | |
| 4 | +import lombok.Getter; | |
| 5 | + | |
| 6 | +/** | |
| 7 | + * 会员经验 - 业务类型 | |
| 8 | + * | |
| 9 | + * @author owen | |
| 10 | + */ | |
| 11 | +@Getter | |
| 12 | +@AllArgsConstructor | |
| 13 | +public enum MemberExperienceBizTypeEnum { | |
| 14 | + /** | |
| 15 | + * 管理员调整、邀请新用户、下单、退单、签到、抽奖 | |
| 16 | + */ | |
| 17 | + ADMIN(0, "管理员调整","管理员调整获得{}经验"), | |
| 18 | + INVITE_REGISTER(1, "邀新奖励","邀请好友获得{}经验"), | |
| 19 | + ORDER(2, "下单奖励", "下单获得{}经验"), | |
| 20 | + REFUND(3, "退单扣除","退单获得{}经验"), | |
| 21 | + SIGN_IN(4, "签到奖励","签到获得{}经验"), | |
| 22 | + LOTTERY(5, "抽奖奖励","抽奖获得{}经验"), | |
| 23 | + ; | |
| 24 | + | |
| 25 | + private final int value; | |
| 26 | + private final String title; | |
| 27 | + private final String desc; | |
| 28 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.api.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; | |
| 4 | +import cn.iocoder.yudao.module.member.service.level.MemberLevelService; | |
| 5 | +import org.springframework.stereotype.Service; | |
| 6 | +import org.springframework.validation.annotation.Validated; | |
| 7 | + | |
| 8 | +import javax.annotation.Resource; | |
| 9 | + | |
| 10 | +/** | |
| 11 | + * 会员等级 API 实现类 | |
| 12 | + * | |
| 13 | + * @author owen | |
| 14 | + */ | |
| 15 | +@Service | |
| 16 | +@Validated | |
| 17 | +public class MemberLevelApiImpl implements MemberLevelApi { | |
| 18 | + | |
| 19 | + @Resource | |
| 20 | + private MemberLevelService memberLevelService; | |
| 21 | + | |
| 22 | + public void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) { | |
| 23 | + memberLevelService.plusExperience(userId, experience, bizType, bizId); | |
| 24 | + } | |
| 25 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceLogController.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; | |
| 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExcelVO; | |
| 8 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExportReqVO; | |
| 9 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO; | |
| 10 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogRespVO; | |
| 11 | +import cn.iocoder.yudao.module.member.convert.level.MemberExperienceLogConvert; | |
| 12 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; | |
| 13 | +import cn.iocoder.yudao.module.member.service.level.MemberExperienceLogService; | |
| 14 | +import io.swagger.v3.oas.annotations.Operation; | |
| 15 | +import io.swagger.v3.oas.annotations.Parameter; | |
| 16 | +import io.swagger.v3.oas.annotations.tags.Tag; | |
| 17 | +import org.springframework.security.access.prepost.PreAuthorize; | |
| 18 | +import org.springframework.validation.annotation.Validated; | |
| 19 | +import org.springframework.web.bind.annotation.*; | |
| 20 | + | |
| 21 | +import javax.annotation.Resource; | |
| 22 | +import javax.servlet.http.HttpServletResponse; | |
| 23 | +import javax.validation.Valid; | |
| 24 | +import java.io.IOException; | |
| 25 | +import java.util.Collection; | |
| 26 | +import java.util.List; | |
| 27 | + | |
| 28 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 29 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | |
| 30 | + | |
| 31 | +/** | |
| 32 | + * @author owen | |
| 33 | + */ | |
| 34 | +@Tag(name = "管理后台 - 会员经验记录") | |
| 35 | +@RestController | |
| 36 | +@RequestMapping("/member/experience-log") | |
| 37 | +@Validated | |
| 38 | +public class MemberExperienceLogController { | |
| 39 | + | |
| 40 | + @Resource | |
| 41 | + private MemberExperienceLogService experienceLogService; | |
| 42 | + | |
| 43 | + @DeleteMapping("/delete") | |
| 44 | + @Operation(summary = "删除会员经验记录") | |
| 45 | + @Parameter(name = "id", description = "编号", required = true) | |
| 46 | + @PreAuthorize("@ss.hasPermission('member:experience-log:delete')") | |
| 47 | + public CommonResult<Boolean> deleteExperienceLog(@RequestParam("id") Long id) { | |
| 48 | + experienceLogService.deleteExperienceLog(id); | |
| 49 | + return success(true); | |
| 50 | + } | |
| 51 | + | |
| 52 | + @GetMapping("/get") | |
| 53 | + @Operation(summary = "获得会员经验记录") | |
| 54 | + @Parameter(name = "id", description = "编号", required = true, example = "1024") | |
| 55 | + @PreAuthorize("@ss.hasPermission('member:experience-log:query')") | |
| 56 | + public CommonResult<MemberExperienceLogRespVO> getExperienceLog(@RequestParam("id") Long id) { | |
| 57 | + MemberExperienceLogDO experienceLog = experienceLogService.getExperienceLog(id); | |
| 58 | + return success(MemberExperienceLogConvert.INSTANCE.convert(experienceLog)); | |
| 59 | + } | |
| 60 | + | |
| 61 | + @GetMapping("/list") | |
| 62 | + @Operation(summary = "获得会员经验记录列表") | |
| 63 | + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") | |
| 64 | + @PreAuthorize("@ss.hasPermission('member:experience-log:query')") | |
| 65 | + public CommonResult<List<MemberExperienceLogRespVO>> getExperienceLogList(@RequestParam("ids") Collection<Long> ids) { | |
| 66 | + List<MemberExperienceLogDO> list = experienceLogService.getExperienceLogList(ids); | |
| 67 | + return success(MemberExperienceLogConvert.INSTANCE.convertList(list)); | |
| 68 | + } | |
| 69 | + | |
| 70 | + @GetMapping("/page") | |
| 71 | + @Operation(summary = "获得会员经验记录分页") | |
| 72 | + @PreAuthorize("@ss.hasPermission('member:experience-log:query')") | |
| 73 | + public CommonResult<PageResult<MemberExperienceLogRespVO>> getExperienceLogPage(@Valid MemberExperienceLogPageReqVO pageVO) { | |
| 74 | + PageResult<MemberExperienceLogDO> pageResult = experienceLogService.getExperienceLogPage(pageVO); | |
| 75 | + return success(MemberExperienceLogConvert.INSTANCE.convertPage(pageResult)); | |
| 76 | + } | |
| 77 | + | |
| 78 | + @GetMapping("/export-excel") | |
| 79 | + @Operation(summary = "导出会员经验记录 Excel") | |
| 80 | + @PreAuthorize("@ss.hasPermission('member:experience-log:export')") | |
| 81 | + @OperateLog(type = EXPORT) | |
| 82 | + public void exportExperienceLogExcel(@Valid MemberExperienceLogExportReqVO exportReqVO, | |
| 83 | + HttpServletResponse response) throws IOException { | |
| 84 | + List<MemberExperienceLogDO> list = experienceLogService.getExperienceLogList(exportReqVO); | |
| 85 | + // 导出 Excel | |
| 86 | + List<MemberExperienceLogExcelVO> datas = MemberExperienceLogConvert.INSTANCE.convertList02(list); | |
| 87 | + ExcelUtils.write(response, "会员经验记录.xls", "数据", MemberExperienceLogExcelVO.class, datas); | |
| 88 | + } | |
| 89 | + | |
| 90 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.*; | |
| 6 | +import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert; | |
| 7 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; | |
| 8 | +import cn.iocoder.yudao.module.member.service.level.MemberLevelService; | |
| 9 | +import io.swagger.v3.oas.annotations.Operation; | |
| 10 | +import io.swagger.v3.oas.annotations.Parameter; | |
| 11 | +import io.swagger.v3.oas.annotations.tags.Tag; | |
| 12 | +import org.springframework.security.access.prepost.PreAuthorize; | |
| 13 | +import org.springframework.validation.annotation.Validated; | |
| 14 | +import org.springframework.web.bind.annotation.*; | |
| 15 | + | |
| 16 | +import javax.annotation.Resource; | |
| 17 | +import javax.validation.Valid; | |
| 18 | +import java.util.Collection; | |
| 19 | +import java.util.List; | |
| 20 | + | |
| 21 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 22 | + | |
| 23 | +/** | |
| 24 | + * @author owen | |
| 25 | + */ | |
| 26 | +@Tag(name = "管理后台 - 会员等级") | |
| 27 | +@RestController | |
| 28 | +@RequestMapping("/member/level") | |
| 29 | +@Validated | |
| 30 | +public class MemberLevelController { | |
| 31 | + | |
| 32 | + @Resource | |
| 33 | + private MemberLevelService levelService; | |
| 34 | + | |
| 35 | + @PostMapping("/create") | |
| 36 | + @Operation(summary = "创建会员等级") | |
| 37 | + @PreAuthorize("@ss.hasPermission('member:level:create')") | |
| 38 | + public CommonResult<Long> createLevel(@Valid @RequestBody MemberLevelCreateReqVO createReqVO) { | |
| 39 | + return success(levelService.createLevel(createReqVO)); | |
| 40 | + } | |
| 41 | + | |
| 42 | + @PutMapping("/update") | |
| 43 | + @Operation(summary = "更新会员等级") | |
| 44 | + @PreAuthorize("@ss.hasPermission('member:level:update')") | |
| 45 | + public CommonResult<Boolean> updateLevel(@Valid @RequestBody MemberLevelUpdateReqVO updateReqVO) { | |
| 46 | + levelService.updateLevel(updateReqVO); | |
| 47 | + return success(true); | |
| 48 | + } | |
| 49 | + | |
| 50 | + @DeleteMapping("/delete") | |
| 51 | + @Operation(summary = "删除会员等级") | |
| 52 | + @Parameter(name = "id", description = "编号", required = true) | |
| 53 | + @PreAuthorize("@ss.hasPermission('member:level:delete')") | |
| 54 | + public CommonResult<Boolean> deleteLevel(@RequestParam("id") Long id) { | |
| 55 | + levelService.deleteLevel(id); | |
| 56 | + return success(true); | |
| 57 | + } | |
| 58 | + | |
| 59 | + @GetMapping("/get") | |
| 60 | + @Operation(summary = "获得会员等级") | |
| 61 | + @Parameter(name = "id", description = "编号", required = true, example = "1024") | |
| 62 | + @PreAuthorize("@ss.hasPermission('member:level:query')") | |
| 63 | + public CommonResult<MemberLevelRespVO> getLevel(@RequestParam("id") Long id) { | |
| 64 | + MemberLevelDO level = levelService.getLevel(id); | |
| 65 | + return success(MemberLevelConvert.INSTANCE.convert(level)); | |
| 66 | + } | |
| 67 | + | |
| 68 | + @GetMapping("/list") | |
| 69 | + @Operation(summary = "获得会员等级列表") | |
| 70 | + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") | |
| 71 | + @PreAuthorize("@ss.hasPermission('member:level:query')") | |
| 72 | + public CommonResult<List<MemberLevelRespVO>> getLevelList(@RequestParam("ids") Collection<Long> ids) { | |
| 73 | + List<MemberLevelDO> list = levelService.getLevelList(ids); | |
| 74 | + return success(MemberLevelConvert.INSTANCE.convertList(list)); | |
| 75 | + } | |
| 76 | + | |
| 77 | + @GetMapping("/list-all-simple") | |
| 78 | + @Operation(summary = "获取会员等级精简信息列表", description = "只包含被开启的会员等级,主要用于前端的下拉选项") | |
| 79 | + public CommonResult<List<MemberLevelSimpleRespVO>> getSimpleLevelList() { | |
| 80 | + // 获用户列表,只要开启状态的 | |
| 81 | + List<MemberLevelDO> list = levelService.getEnableLevelList(); | |
| 82 | + // 排序后,返回给前端 | |
| 83 | + return success(MemberLevelConvert.INSTANCE.convertSimpleList(list)); | |
| 84 | + } | |
| 85 | + | |
| 86 | + @GetMapping("/page") | |
| 87 | + @Operation(summary = "获得会员等级分页") | |
| 88 | + @PreAuthorize("@ss.hasPermission('member:level:query')") | |
| 89 | + public CommonResult<PageResult<MemberLevelRespVO>> getLevelPage(@Valid MemberLevelPageReqVO pageVO) { | |
| 90 | + PageResult<MemberLevelDO> pageResult = levelService.getLevelPage(pageVO); | |
| 91 | + return success(MemberLevelConvert.INSTANCE.convertPage(pageResult)); | |
| 92 | + } | |
| 93 | + | |
| 94 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelLogController.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; | |
| 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExcelVO; | |
| 8 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExportReqVO; | |
| 9 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO; | |
| 10 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogRespVO; | |
| 11 | +import cn.iocoder.yudao.module.member.convert.level.MemberLevelLogConvert; | |
| 12 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; | |
| 13 | +import cn.iocoder.yudao.module.member.service.level.MemberLevelLogService; | |
| 14 | +import io.swagger.v3.oas.annotations.Operation; | |
| 15 | +import io.swagger.v3.oas.annotations.Parameter; | |
| 16 | +import io.swagger.v3.oas.annotations.tags.Tag; | |
| 17 | +import org.springframework.security.access.prepost.PreAuthorize; | |
| 18 | +import org.springframework.validation.annotation.Validated; | |
| 19 | +import org.springframework.web.bind.annotation.*; | |
| 20 | + | |
| 21 | +import javax.annotation.Resource; | |
| 22 | +import javax.servlet.http.HttpServletResponse; | |
| 23 | +import javax.validation.Valid; | |
| 24 | +import java.io.IOException; | |
| 25 | +import java.util.Collection; | |
| 26 | +import java.util.List; | |
| 27 | + | |
| 28 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 29 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | |
| 30 | + | |
| 31 | +/** | |
| 32 | + * @author owen | |
| 33 | + */ | |
| 34 | +@Tag(name = "管理后台 - 会员等级记录") | |
| 35 | +@RestController | |
| 36 | +@RequestMapping("/member/level-log") | |
| 37 | +@Validated | |
| 38 | +public class MemberLevelLogController { | |
| 39 | + | |
| 40 | + @Resource | |
| 41 | + private MemberLevelLogService levelLogService; | |
| 42 | + | |
| 43 | + @DeleteMapping("/delete") | |
| 44 | + @Operation(summary = "删除会员等级记录") | |
| 45 | + @Parameter(name = "id", description = "编号", required = true) | |
| 46 | + @PreAuthorize("@ss.hasPermission('member:level-log:delete')") | |
| 47 | + public CommonResult<Boolean> deleteLevelLog(@RequestParam("id") Long id) { | |
| 48 | + levelLogService.deleteLevelLog(id); | |
| 49 | + return success(true); | |
| 50 | + } | |
| 51 | + | |
| 52 | + @GetMapping("/get") | |
| 53 | + @Operation(summary = "获得会员等级记录") | |
| 54 | + @Parameter(name = "id", description = "编号", required = true, example = "1024") | |
| 55 | + @PreAuthorize("@ss.hasPermission('member:level-log:query')") | |
| 56 | + public CommonResult<MemberLevelLogRespVO> getLevelLog(@RequestParam("id") Long id) { | |
| 57 | + MemberLevelLogDO levelLog = levelLogService.getLevelLog(id); | |
| 58 | + return success(MemberLevelLogConvert.INSTANCE.convert(levelLog)); | |
| 59 | + } | |
| 60 | + | |
| 61 | + @GetMapping("/list") | |
| 62 | + @Operation(summary = "获得会员等级记录列表") | |
| 63 | + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") | |
| 64 | + @PreAuthorize("@ss.hasPermission('member:level-log:query')") | |
| 65 | + public CommonResult<List<MemberLevelLogRespVO>> getLevelLogList(@RequestParam("ids") Collection<Long> ids) { | |
| 66 | + List<MemberLevelLogDO> list = levelLogService.getLevelLogList(ids); | |
| 67 | + return success(MemberLevelLogConvert.INSTANCE.convertList(list)); | |
| 68 | + } | |
| 69 | + | |
| 70 | + @GetMapping("/page") | |
| 71 | + @Operation(summary = "获得会员等级记录分页") | |
| 72 | + @PreAuthorize("@ss.hasPermission('member:level-log:query')") | |
| 73 | + public CommonResult<PageResult<MemberLevelLogRespVO>> getLevelLogPage(@Valid MemberLevelLogPageReqVO pageVO) { | |
| 74 | + PageResult<MemberLevelLogDO> pageResult = levelLogService.getLevelLogPage(pageVO); | |
| 75 | + return success(MemberLevelLogConvert.INSTANCE.convertPage(pageResult)); | |
| 76 | + } | |
| 77 | + | |
| 78 | + @GetMapping("/export-excel") | |
| 79 | + @Operation(summary = "导出会员等级记录 Excel") | |
| 80 | + @PreAuthorize("@ss.hasPermission('member:level-log:export')") | |
| 81 | + @OperateLog(type = EXPORT) | |
| 82 | + public void exportLevelLogExcel(@Valid MemberLevelLogExportReqVO exportReqVO, | |
| 83 | + HttpServletResponse response) throws IOException { | |
| 84 | + List<MemberLevelLogDO> list = levelLogService.getLevelLogList(exportReqVO); | |
| 85 | + // 导出 Excel | |
| 86 | + List<MemberLevelLogExcelVO> datas = MemberLevelLogConvert.INSTANCE.convertList02(list); | |
| 87 | + ExcelUtils.write(response, "会员等级记录.xls", "数据", MemberLevelLogExcelVO.class, datas); | |
| 88 | + } | |
| 89 | + | |
| 90 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelBaseVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | +import org.hibernate.validator.constraints.Range; | |
| 6 | +import org.hibernate.validator.constraints.URL; | |
| 7 | + | |
| 8 | +import javax.validation.constraints.NotBlank; | |
| 9 | +import javax.validation.constraints.NotNull; | |
| 10 | +import javax.validation.constraints.Positive; | |
| 11 | + | |
| 12 | +/** | |
| 13 | + * 会员等级 Base VO,提供给添加、修改、详细的子 VO 使用 | |
| 14 | + * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | |
| 15 | + * | |
| 16 | + * @author owen | |
| 17 | + */ | |
| 18 | +@Data | |
| 19 | +public class MemberLevelBaseVO { | |
| 20 | + | |
| 21 | + @Schema(description = "等级名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") | |
| 22 | + @NotBlank(message = "等级名称不能为空") | |
| 23 | + private String name; | |
| 24 | + | |
| 25 | + @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") | |
| 26 | + @NotNull(message = "升级经验不能为空") | |
| 27 | + @Positive(message = "升级经验必须大于0") | |
| 28 | + private Integer experience; | |
| 29 | + | |
| 30 | + @Schema(description = "等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | |
| 31 | + @NotNull(message = "等级不能为空") | |
| 32 | + @Positive(message = "等级必须大于0") | |
| 33 | + private Integer level; | |
| 34 | + | |
| 35 | + @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "98") | |
| 36 | + @NotNull(message = "享受折扣不能为空") | |
| 37 | + @Range(min = 0, max = 100, message = "享受折扣的范围为0-100") | |
| 38 | + private Integer discount; | |
| 39 | + | |
| 40 | + @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg") | |
| 41 | + @URL(message = "等级图标 必须是 URL 格式") | |
| 42 | + private String icon; | |
| 43 | + | |
| 44 | + @Schema(description = "等级背景图", example = "https://www.iocoder.cn/yudao.jpg") | |
| 45 | + @URL(message = "等级背景图 必须是 URL 格式") | |
| 46 | + private String backgroundUrl; | |
| 47 | + | |
| 48 | + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | |
| 49 | + @NotNull(message = "状态不能为空") | |
| 50 | + private Integer status; | |
| 51 | + | |
| 52 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelCreateReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | +import lombok.EqualsAndHashCode; | |
| 6 | +import lombok.ToString; | |
| 7 | + | |
| 8 | +/** | |
| 9 | + * @author owen | |
| 10 | + */ | |
| 11 | +@Schema(description = "管理后台 - 会员等级创建 Request VO") | |
| 12 | +@Data | |
| 13 | +@EqualsAndHashCode(callSuper = true) | |
| 14 | +@ToString(callSuper = true) | |
| 15 | +public class MemberLevelCreateReqVO extends MemberLevelBaseVO { | |
| 16 | + | |
| 17 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelPageReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 5 | +import lombok.Data; | |
| 6 | +import lombok.EqualsAndHashCode; | |
| 7 | +import lombok.ToString; | |
| 8 | + | |
| 9 | +/** | |
| 10 | + * @author owen | |
| 11 | + */ | |
| 12 | +@Schema(description = "管理后台 - 会员等级分页 Request VO") | |
| 13 | +@Data | |
| 14 | +@EqualsAndHashCode(callSuper = true) | |
| 15 | +@ToString(callSuper = true) | |
| 16 | +public class MemberLevelPageReqVO extends PageParam { | |
| 17 | + | |
| 18 | + @Schema(description = "等级名称", example = "芋艿") | |
| 19 | + private String name; | |
| 20 | + | |
| 21 | + @Schema(description = "状态", example = "1") | |
| 22 | + private Integer status; | |
| 23 | + | |
| 24 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelRespVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | +import lombok.EqualsAndHashCode; | |
| 6 | +import lombok.ToString; | |
| 7 | + | |
| 8 | +import java.time.LocalDateTime; | |
| 9 | + | |
| 10 | +/** | |
| 11 | + * @author owen | |
| 12 | + */ | |
| 13 | +@Schema(description = "管理后台 - 会员等级 Response VO") | |
| 14 | +@Data | |
| 15 | +@EqualsAndHashCode(callSuper = true) | |
| 16 | +@ToString(callSuper = true) | |
| 17 | +public class MemberLevelRespVO extends MemberLevelBaseVO { | |
| 18 | + | |
| 19 | + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6103") | |
| 20 | + private Long id; | |
| 21 | + | |
| 22 | + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | |
| 23 | + private LocalDateTime createTime; | |
| 24 | + | |
| 25 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelSimpleRespVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | +import lombok.EqualsAndHashCode; | |
| 6 | +import lombok.ToString; | |
| 7 | + | |
| 8 | +/** | |
| 9 | + * @author owen | |
| 10 | + */ | |
| 11 | +@Schema(description = "管理后台 - 会员等级 Response VO") | |
| 12 | +@Data | |
| 13 | +@EqualsAndHashCode(callSuper = true) | |
| 14 | +@ToString(callSuper = true) | |
| 15 | +public class MemberLevelSimpleRespVO extends MemberLevelBaseVO { | |
| 16 | + | |
| 17 | + @Schema(description = "编号", example = "6103") | |
| 18 | + private Long id; | |
| 19 | + | |
| 20 | + @Schema(description = "等级名称", example = "芋艿") | |
| 21 | + private String name; | |
| 22 | + | |
| 23 | + @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg") | |
| 24 | + private String icon; | |
| 25 | + | |
| 26 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelUpdateReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | +import lombok.EqualsAndHashCode; | |
| 6 | +import lombok.ToString; | |
| 7 | + | |
| 8 | +import javax.validation.constraints.NotNull; | |
| 9 | + | |
| 10 | +/** | |
| 11 | + * @author owen | |
| 12 | + */ | |
| 13 | +@Schema(description = "管理后台 - 会员等级更新 Request VO") | |
| 14 | +@Data | |
| 15 | +@EqualsAndHashCode(callSuper = true) | |
| 16 | +@ToString(callSuper = true) | |
| 17 | +public class MemberLevelUpdateReqVO extends MemberLevelBaseVO { | |
| 18 | + | |
| 19 | + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6103") | |
| 20 | + @NotNull(message = "编号不能为空") | |
| 21 | + private Long id; | |
| 22 | + | |
| 23 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogBaseVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | + | |
| 6 | +import javax.validation.constraints.NotNull; | |
| 7 | + | |
| 8 | +/** | |
| 9 | + * 会员经验记录 Base VO,提供给添加、修改、详细的子 VO 使用 | |
| 10 | + * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | |
| 11 | + * | |
| 12 | + * @author owen | |
| 13 | + */ | |
| 14 | +@Data | |
| 15 | +public class MemberExperienceLogBaseVO { | |
| 16 | + | |
| 17 | + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3638") | |
| 18 | + @NotNull(message = "用户编号不能为空") | |
| 19 | + private Long userId; | |
| 20 | + | |
| 21 | + @Schema(description = "业务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12164") | |
| 22 | + @NotNull(message = "业务编号不能为空") | |
| 23 | + private String bizId; | |
| 24 | + | |
| 25 | + @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | |
| 26 | + @NotNull(message = "业务类型不能为空") | |
| 27 | + private Integer bizType; | |
| 28 | + | |
| 29 | + @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "增加经验") | |
| 30 | + @NotNull(message = "标题不能为空") | |
| 31 | + private String title; | |
| 32 | + | |
| 33 | + @Schema(description = "经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") | |
| 34 | + @NotNull(message = "经验不能为空") | |
| 35 | + private Integer experience; | |
| 36 | + | |
| 37 | + @Schema(description = "变更后的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") | |
| 38 | + @NotNull(message = "变更后的经验不能为空") | |
| 39 | + private Integer totalExperience; | |
| 40 | + | |
| 41 | + @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "下单增加100经验") | |
| 42 | + @NotNull(message = "描述不能为空") | |
| 43 | + private String description; | |
| 44 | + | |
| 45 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogExcelVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | |
| 4 | +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | |
| 5 | +import cn.iocoder.yudao.module.member.enums.DictTypeConstants; | |
| 6 | +import com.alibaba.excel.annotation.ExcelProperty; | |
| 7 | +import lombok.Data; | |
| 8 | + | |
| 9 | +import java.time.LocalDateTime; | |
| 10 | + | |
| 11 | + | |
| 12 | +/** | |
| 13 | + * 会员经验记录 Excel VO | |
| 14 | + * | |
| 15 | + * @author owen | |
| 16 | + */ | |
| 17 | +@Data | |
| 18 | +public class MemberExperienceLogExcelVO { | |
| 19 | + | |
| 20 | + @ExcelProperty("编号") | |
| 21 | + private Long id; | |
| 22 | + | |
| 23 | + @ExcelProperty("用户编号") | |
| 24 | + private Long userId; | |
| 25 | + | |
| 26 | + @ExcelProperty(value = "业务类型", converter = DictConvert.class) | |
| 27 | + @DictFormat(DictTypeConstants.MEMBER_EXPERIENCE_BIZ_TYPE) | |
| 28 | + private Integer bizType; | |
| 29 | + | |
| 30 | + @ExcelProperty("业务编号") | |
| 31 | + private String bizId; | |
| 32 | + | |
| 33 | + @ExcelProperty("标题") | |
| 34 | + private String title; | |
| 35 | + | |
| 36 | + @ExcelProperty("经验") | |
| 37 | + private Integer experience; | |
| 38 | + | |
| 39 | + @ExcelProperty("变更后的经验") | |
| 40 | + private Integer totalExperience; | |
| 41 | + | |
| 42 | + @ExcelProperty("描述") | |
| 43 | + private String description; | |
| 44 | + | |
| 45 | + @ExcelProperty("创建时间") | |
| 46 | + private LocalDateTime createTime; | |
| 47 | + | |
| 48 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogExportReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | +import org.springframework.format.annotation.DateTimeFormat; | |
| 6 | + | |
| 7 | +import java.time.LocalDateTime; | |
| 8 | + | |
| 9 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | + | |
| 11 | +/** | |
| 12 | + * @author owen | |
| 13 | + */ | |
| 14 | +@Schema(description = "管理后台 - 会员经验记录 Excel 导出 Request VO,参数和 MemberExperienceLogPageReqVO 是一致的") | |
| 15 | +@Data | |
| 16 | +public class MemberExperienceLogExportReqVO { | |
| 17 | + | |
| 18 | + @Schema(description = "用户编号", example = "3638") | |
| 19 | + private Long userId; | |
| 20 | + | |
| 21 | + @Schema(description = "业务类型", example = "1") | |
| 22 | + private Integer bizType; | |
| 23 | + | |
| 24 | + @Schema(description = "业务编号", example = "12164") | |
| 25 | + private String bizId; | |
| 26 | + | |
| 27 | + @Schema(description = "标题", example = "增加经验") | |
| 28 | + private String title; | |
| 29 | + | |
| 30 | + @Schema(description = "创建时间") | |
| 31 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | |
| 32 | + private LocalDateTime[] createTime; | |
| 33 | + | |
| 34 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogPageReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 5 | +import lombok.Data; | |
| 6 | +import lombok.EqualsAndHashCode; | |
| 7 | +import lombok.ToString; | |
| 8 | +import org.springframework.format.annotation.DateTimeFormat; | |
| 9 | + | |
| 10 | +import java.time.LocalDateTime; | |
| 11 | + | |
| 12 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | + | |
| 14 | +/** | |
| 15 | + * @author owen | |
| 16 | + */ | |
| 17 | +@Schema(description = "管理后台 - 会员经验记录分页 Request VO") | |
| 18 | +@Data | |
| 19 | +@EqualsAndHashCode(callSuper = true) | |
| 20 | +@ToString(callSuper = true) | |
| 21 | +public class MemberExperienceLogPageReqVO extends PageParam { | |
| 22 | + | |
| 23 | + @Schema(description = "用户编号", example = "3638") | |
| 24 | + private Long userId; | |
| 25 | + | |
| 26 | + @Schema(description = "业务编号", example = "12164") | |
| 27 | + private String bizId; | |
| 28 | + | |
| 29 | + @Schema(description = "业务类型", example = "1") | |
| 30 | + private Integer bizType; | |
| 31 | + | |
| 32 | + @Schema(description = "标题", example = "增加经验") | |
| 33 | + private String title; | |
| 34 | + | |
| 35 | + @Schema(description = "创建时间") | |
| 36 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | |
| 37 | + private LocalDateTime[] createTime; | |
| 38 | + | |
| 39 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogRespVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | +import lombok.EqualsAndHashCode; | |
| 6 | +import lombok.ToString; | |
| 7 | + | |
| 8 | +import java.time.LocalDateTime; | |
| 9 | + | |
| 10 | +/** | |
| 11 | + * @author owen | |
| 12 | + */ | |
| 13 | +@Schema(description = "管理后台 - 会员经验记录 Response VO") | |
| 14 | +@Data | |
| 15 | +@EqualsAndHashCode(callSuper = true) | |
| 16 | +@ToString(callSuper = true) | |
| 17 | +public class MemberExperienceLogRespVO extends MemberExperienceLogBaseVO { | |
| 18 | + | |
| 19 | + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610") | |
| 20 | + private Long id; | |
| 21 | + | |
| 22 | + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | |
| 23 | + private LocalDateTime createTime; | |
| 24 | + | |
| 25 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogBaseVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo.log; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | + | |
| 6 | +import javax.validation.constraints.NotNull; | |
| 7 | + | |
| 8 | +/** | |
| 9 | + * 会员等级记录 Base VO,提供给添加、修改、详细的子 VO 使用 | |
| 10 | + * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | |
| 11 | + * | |
| 12 | + * @author owen | |
| 13 | + */ | |
| 14 | +@Data | |
| 15 | +public class MemberLevelLogBaseVO { | |
| 16 | + | |
| 17 | + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25923") | |
| 18 | + @NotNull(message = "用户编号不能为空") | |
| 19 | + private Long userId; | |
| 20 | + | |
| 21 | + @Schema(description = "等级编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25985") | |
| 22 | + @NotNull(message = "等级编号不能为空") | |
| 23 | + private Long levelId; | |
| 24 | + | |
| 25 | + @Schema(description = "会员等级", requiredMode = Schema.RequiredMode.REQUIRED) | |
| 26 | + @NotNull(message = "会员等级不能为空") | |
| 27 | + private Integer level; | |
| 28 | + | |
| 29 | + @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319") | |
| 30 | + @NotNull(message = "享受折扣不能为空") | |
| 31 | + private Integer discount; | |
| 32 | + | |
| 33 | + @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319") | |
| 34 | + @NotNull(message = "升级经验不能为空") | |
| 35 | + private Integer experience; | |
| 36 | + | |
| 37 | + @Schema(description = "会员此时的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319") | |
| 38 | + @NotNull(message = "会员此时的经验不能为空") | |
| 39 | + private Integer userExperience; | |
| 40 | + | |
| 41 | + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要") | |
| 42 | + @NotNull(message = "备注不能为空") | |
| 43 | + private String remark; | |
| 44 | + | |
| 45 | + @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "升级为金牌会员") | |
| 46 | + @NotNull(message = "描述不能为空") | |
| 47 | + private String description; | |
| 48 | + | |
| 49 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogExcelVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo.log; | |
| 2 | + | |
| 3 | +import com.alibaba.excel.annotation.ExcelProperty; | |
| 4 | +import lombok.Data; | |
| 5 | + | |
| 6 | +import java.time.LocalDateTime; | |
| 7 | + | |
| 8 | +/** | |
| 9 | + * 会员等级记录 Excel VO | |
| 10 | + * | |
| 11 | + * @author owen | |
| 12 | + */ | |
| 13 | +@Data | |
| 14 | +public class MemberLevelLogExcelVO { | |
| 15 | + | |
| 16 | + @ExcelProperty("编号") | |
| 17 | + private Long id; | |
| 18 | + | |
| 19 | + @ExcelProperty("用户编号") | |
| 20 | + private Long userId; | |
| 21 | + | |
| 22 | + @ExcelProperty("等级编号") | |
| 23 | + private Long levelId; | |
| 24 | + | |
| 25 | + @ExcelProperty("会员等级") | |
| 26 | + private Integer level; | |
| 27 | + | |
| 28 | + @ExcelProperty("享受折扣") | |
| 29 | + private Integer discount; | |
| 30 | + | |
| 31 | + @ExcelProperty("升级经验") | |
| 32 | + private Integer experience; | |
| 33 | + | |
| 34 | + @ExcelProperty("会员此时的经验") | |
| 35 | + private Integer userExperience; | |
| 36 | + | |
| 37 | + @ExcelProperty("备注") | |
| 38 | + private String remark; | |
| 39 | + | |
| 40 | + @ExcelProperty("描述") | |
| 41 | + private String description; | |
| 42 | + | |
| 43 | + @ExcelProperty("创建时间") | |
| 44 | + private LocalDateTime createTime; | |
| 45 | + | |
| 46 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogExportReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo.log; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | +import org.springframework.format.annotation.DateTimeFormat; | |
| 6 | + | |
| 7 | +import java.time.LocalDateTime; | |
| 8 | + | |
| 9 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | + | |
| 11 | +/** | |
| 12 | + * @author owen | |
| 13 | + */ | |
| 14 | +@Schema(description = "管理后台 - 会员等级记录 Excel 导出 Request VO,参数和 MemberLevelLogPageReqVO 是一致的") | |
| 15 | +@Data | |
| 16 | +public class MemberLevelLogExportReqVO { | |
| 17 | + | |
| 18 | + @Schema(description = "用户编号", example = "25923") | |
| 19 | + private Long userId; | |
| 20 | + | |
| 21 | + @Schema(description = "等级编号", example = "25985") | |
| 22 | + private Long levelId; | |
| 23 | + | |
| 24 | + @Schema(description = "创建时间") | |
| 25 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | |
| 26 | + private LocalDateTime[] createTime; | |
| 27 | + | |
| 28 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogPageReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo.log; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 5 | +import lombok.Data; | |
| 6 | +import lombok.EqualsAndHashCode; | |
| 7 | +import lombok.ToString; | |
| 8 | +import org.springframework.format.annotation.DateTimeFormat; | |
| 9 | + | |
| 10 | +import java.time.LocalDateTime; | |
| 11 | + | |
| 12 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | + | |
| 14 | +/** | |
| 15 | + * @author owen | |
| 16 | + */ | |
| 17 | +@Schema(description = "管理后台 - 会员等级记录分页 Request VO") | |
| 18 | +@Data | |
| 19 | +@EqualsAndHashCode(callSuper = true) | |
| 20 | +@ToString(callSuper = true) | |
| 21 | +public class MemberLevelLogPageReqVO extends PageParam { | |
| 22 | + | |
| 23 | + @Schema(description = "用户编号", example = "25923") | |
| 24 | + private Long userId; | |
| 25 | + | |
| 26 | + @Schema(description = "等级编号", example = "25985") | |
| 27 | + private Long levelId; | |
| 28 | + | |
| 29 | + @Schema(description = "创建时间") | |
| 30 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | |
| 31 | + private LocalDateTime[] createTime; | |
| 32 | + | |
| 33 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogRespVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.admin.level.vo.log; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | +import lombok.EqualsAndHashCode; | |
| 6 | +import lombok.ToString; | |
| 7 | + | |
| 8 | +import java.time.LocalDateTime; | |
| 9 | + | |
| 10 | +/** | |
| 11 | + * @author owen | |
| 12 | + */ | |
| 13 | +@Schema(description = "管理后台 - 会员等级记录 Response VO") | |
| 14 | +@Data | |
| 15 | +@EqualsAndHashCode(callSuper = true) | |
| 16 | +@ToString(callSuper = true) | |
| 17 | +public class MemberLevelLogRespVO extends MemberLevelLogBaseVO { | |
| 18 | + | |
| 19 | + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8741") | |
| 20 | + private Long id; | |
| 21 | + | |
| 22 | + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | |
| 23 | + private LocalDateTime createTime; | |
| 24 | + | |
| 25 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/MemberTagController.java
| ... | ... | @@ -65,6 +65,15 @@ public class MemberTagController { |
| 65 | 65 | return success(MemberTagConvert.INSTANCE.convert(tag)); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | + @GetMapping("/list-all-simple") | |
| 69 | + @Operation(summary = "获取会员标签精简信息列表", description = "只包含被开启的会员标签,主要用于前端的下拉选项") | |
| 70 | + public CommonResult<List<MemberTagRespVO>> getSimpleTagList() { | |
| 71 | + // 获用户列表,只要开启状态的 | |
| 72 | + List<MemberTagDO> list = tagService.getList(); | |
| 73 | + // 排序后,返回给前端 | |
| 74 | + return success(MemberTagConvert.INSTANCE.convertList(list)); | |
| 75 | + } | |
| 76 | + | |
| 68 | 77 | @GetMapping("/list") |
| 69 | 78 | @Operation(summary = "获得会员标签列表") |
| 70 | 79 | @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
| ... | ... | @@ -7,8 +7,10 @@ import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReq |
| 7 | 7 | import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO; |
| 8 | 8 | import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; |
| 9 | 9 | import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; |
| 10 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; | |
| 10 | 11 | import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; |
| 11 | 12 | import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; |
| 13 | +import cn.iocoder.yudao.module.member.service.level.MemberLevelService; | |
| 12 | 14 | import cn.iocoder.yudao.module.member.service.tag.MemberTagService; |
| 13 | 15 | import cn.iocoder.yudao.module.member.service.user.MemberUserService; |
| 14 | 16 | import io.swagger.v3.oas.annotations.Operation; |
| ... | ... | @@ -38,6 +40,8 @@ public class MemberUserController { |
| 38 | 40 | private MemberUserService memberUserService; |
| 39 | 41 | @Resource |
| 40 | 42 | private MemberTagService memberTagService; |
| 43 | + @Resource | |
| 44 | + private MemberLevelService memberLevelService; | |
| 41 | 45 | |
| 42 | 46 | @PutMapping("/update") |
| 43 | 47 | @Operation(summary = "更新会员用户") |
| ... | ... | @@ -72,7 +76,11 @@ public class MemberUserController { |
| 72 | 76 | .flatMap(Collection::stream) |
| 73 | 77 | .collect(Collectors.toSet()); |
| 74 | 78 | List<MemberTagDO> tags = memberTagService.getTagList(tagIds); |
| 75 | - return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags)); | |
| 79 | + | |
| 80 | + // 处理会员级别返显 | |
| 81 | + List<MemberLevelDO> levels = memberLevelService.getEnableLevelList(); | |
| 82 | + | |
| 83 | + return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels)); | |
| 76 | 84 | } |
| 77 | 85 | |
| 78 | 86 | } | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java
| ... | ... | @@ -32,7 +32,10 @@ public class MemberUserPageReqVO extends PageParam { |
| 32 | 32 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| 33 | 33 | private LocalDateTime[] createTime; |
| 34 | 34 | |
| 35 | - @Schema(description = "会员标签", example = "[1, 2]") | |
| 35 | + @Schema(description = "会员标签编号列表", example = "[1, 2]") | |
| 36 | 36 | private List<Long> tagIds; |
| 37 | 37 | |
| 38 | + @Schema(description = "会员等级标号", example = "1") | |
| 39 | + private Long levelId; | |
| 40 | + | |
| 38 | 41 | } | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java
| ... | ... | @@ -17,4 +17,7 @@ public class MemberUserUpdateReqVO extends MemberUserBaseVO { |
| 17 | 17 | @NotNull(message = "编号不能为空") |
| 18 | 18 | private Long id; |
| 19 | 19 | |
| 20 | + @Schema(description = "会员级别修改原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要") | |
| 21 | + private String levelReason; | |
| 22 | + | |
| 20 | 23 | } | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceLogConvert.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.convert.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExcelVO; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogRespVO; | |
| 6 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; | |
| 7 | +import org.mapstruct.Mapper; | |
| 8 | +import org.mapstruct.factory.Mappers; | |
| 9 | + | |
| 10 | +import java.util.List; | |
| 11 | + | |
| 12 | +/** | |
| 13 | + * 会员经验记录 Convert | |
| 14 | + * | |
| 15 | + * @author owen | |
| 16 | + */ | |
| 17 | +@Mapper | |
| 18 | +public interface MemberExperienceLogConvert { | |
| 19 | + | |
| 20 | + MemberExperienceLogConvert INSTANCE = Mappers.getMapper(MemberExperienceLogConvert.class); | |
| 21 | + | |
| 22 | + MemberExperienceLogRespVO convert(MemberExperienceLogDO bean); | |
| 23 | + | |
| 24 | + List<MemberExperienceLogRespVO> convertList(List<MemberExperienceLogDO> list); | |
| 25 | + | |
| 26 | + PageResult<MemberExperienceLogRespVO> convertPage(PageResult<MemberExperienceLogDO> page); | |
| 27 | + | |
| 28 | + List<MemberExperienceLogExcelVO> convertList02(List<MemberExperienceLogDO> list); | |
| 29 | + | |
| 30 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.convert.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelCreateReqVO; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelRespVO; | |
| 6 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelSimpleRespVO; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelUpdateReqVO; | |
| 8 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; | |
| 9 | +import org.mapstruct.Mapper; | |
| 10 | +import org.mapstruct.factory.Mappers; | |
| 11 | + | |
| 12 | +import java.util.List; | |
| 13 | + | |
| 14 | +/** | |
| 15 | + * 会员等级 Convert | |
| 16 | + * | |
| 17 | + * @author owen | |
| 18 | + */ | |
| 19 | +@Mapper | |
| 20 | +public interface MemberLevelConvert { | |
| 21 | + | |
| 22 | + MemberLevelConvert INSTANCE = Mappers.getMapper(MemberLevelConvert.class); | |
| 23 | + | |
| 24 | + MemberLevelDO convert(MemberLevelCreateReqVO bean); | |
| 25 | + | |
| 26 | + MemberLevelDO convert(MemberLevelUpdateReqVO bean); | |
| 27 | + | |
| 28 | + MemberLevelRespVO convert(MemberLevelDO bean); | |
| 29 | + | |
| 30 | + List<MemberLevelRespVO> convertList(List<MemberLevelDO> list); | |
| 31 | + | |
| 32 | + PageResult<MemberLevelRespVO> convertPage(PageResult<MemberLevelDO> page); | |
| 33 | + | |
| 34 | + List<MemberLevelSimpleRespVO> convertSimpleList(List<MemberLevelDO> list); | |
| 35 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelLogConvert.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.convert.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExcelVO; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogRespVO; | |
| 6 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; | |
| 7 | +import org.mapstruct.Mapper; | |
| 8 | +import org.mapstruct.factory.Mappers; | |
| 9 | + | |
| 10 | +import java.util.List; | |
| 11 | + | |
| 12 | +/** | |
| 13 | + * 会员等级记录 Convert | |
| 14 | + * | |
| 15 | + * @author owen | |
| 16 | + */ | |
| 17 | +@Mapper | |
| 18 | +public interface MemberLevelLogConvert { | |
| 19 | + | |
| 20 | + MemberLevelLogConvert INSTANCE = Mappers.getMapper(MemberLevelLogConvert.class); | |
| 21 | + | |
| 22 | + MemberLevelLogRespVO convert(MemberLevelLogDO bean); | |
| 23 | + | |
| 24 | + List<MemberLevelLogRespVO> convertList(List<MemberLevelLogDO> list); | |
| 25 | + | |
| 26 | + PageResult<MemberLevelLogRespVO> convertPage(PageResult<MemberLevelLogDO> page); | |
| 27 | + | |
| 28 | + List<MemberLevelLogExcelVO> convertList02(List<MemberLevelLogDO> list); | |
| 29 | + | |
| 30 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
| 1 | 1 | package cn.iocoder.yudao.module.member.convert.user; |
| 2 | 2 | |
| 3 | +import cn.hutool.core.map.MapUtil; | |
| 4 | +import cn.hutool.core.util.StrUtil; | |
| 3 | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | 6 | import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; |
| 5 | 7 | import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO; |
| 6 | 8 | import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; |
| 7 | 9 | import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO; |
| 10 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; | |
| 8 | 11 | import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; |
| 9 | 12 | import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; |
| 10 | 13 | import org.mapstruct.Mapper; |
| ... | ... | @@ -34,11 +37,18 @@ public interface MemberUserConvert { |
| 34 | 37 | MemberUserRespVO convert03(MemberUserDO bean); |
| 35 | 38 | |
| 36 | 39 | default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult, |
| 37 | - List<MemberTagDO> tags) { | |
| 40 | + List<MemberTagDO> tags, | |
| 41 | + List<MemberLevelDO> levels) { | |
| 38 | 42 | PageResult<MemberUserRespVO> result = convertPage(pageResult); |
| 43 | + | |
| 44 | + // 处理关联数据 | |
| 39 | 45 | Map<Long, String> tagMap = convertMap(tags, MemberTagDO::getId, MemberTagDO::getName); |
| 46 | + Map<Long, String> levelMap = convertMap(levels, MemberLevelDO::getId, MemberLevelDO::getName); | |
| 47 | + | |
| 48 | + // 填充关联数据 | |
| 40 | 49 | for (MemberUserRespVO vo : result.getList()) { |
| 41 | 50 | vo.setTagNames(convertList(vo.getTagIds(), tagMap::get)); |
| 51 | + vo.setLevelName(MapUtil.getStr(levelMap, vo.getLevelId(), StrUtil.EMPTY)); | |
| 42 | 52 | } |
| 43 | 53 | return result; |
| 44 | 54 | } | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceLogDO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.dal.dataobject.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; | |
| 5 | +import com.baomidou.mybatisplus.annotation.KeySequence; | |
| 6 | +import com.baomidou.mybatisplus.annotation.TableId; | |
| 7 | +import com.baomidou.mybatisplus.annotation.TableName; | |
| 8 | +import lombok.*; | |
| 9 | + | |
| 10 | +/** | |
| 11 | + * 会员经验记录 DO | |
| 12 | + * | |
| 13 | + * @author owen | |
| 14 | + */ | |
| 15 | +@TableName("member_experience_log") | |
| 16 | +@KeySequence("member_experience_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | |
| 17 | +@Data | |
| 18 | +@EqualsAndHashCode(callSuper = true) | |
| 19 | +@ToString(callSuper = true) | |
| 20 | +@Builder | |
| 21 | +@NoArgsConstructor | |
| 22 | +@AllArgsConstructor | |
| 23 | +public class MemberExperienceLogDO extends BaseDO { | |
| 24 | + | |
| 25 | + /** | |
| 26 | + * 编号 | |
| 27 | + */ | |
| 28 | + @TableId | |
| 29 | + private Long id; | |
| 30 | + /** | |
| 31 | + * 用户编号 | |
| 32 | + */ | |
| 33 | + private Long userId; | |
| 34 | + /** | |
| 35 | + * 业务类型 | |
| 36 | + * <p> | |
| 37 | + * 枚举 {@link MemberExperienceBizTypeEnum} | |
| 38 | + */ | |
| 39 | + private Integer bizType; | |
| 40 | + /** | |
| 41 | + * 业务编号 | |
| 42 | + */ | |
| 43 | + private String bizId; | |
| 44 | + /** | |
| 45 | + * 标题 | |
| 46 | + */ | |
| 47 | + private String title; | |
| 48 | + /** | |
| 49 | + * 经验 | |
| 50 | + */ | |
| 51 | + private Integer experience; | |
| 52 | + /** | |
| 53 | + * 变更后的经验 | |
| 54 | + */ | |
| 55 | + private Integer totalExperience; | |
| 56 | + /** | |
| 57 | + * 描述 | |
| 58 | + */ | |
| 59 | + private String description; | |
| 60 | + | |
| 61 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelDO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.dal.dataobject.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | +import com.baomidou.mybatisplus.annotation.KeySequence; | |
| 6 | +import com.baomidou.mybatisplus.annotation.TableId; | |
| 7 | +import com.baomidou.mybatisplus.annotation.TableName; | |
| 8 | +import lombok.*; | |
| 9 | + | |
| 10 | +/** | |
| 11 | + * 会员等级 DO | |
| 12 | + * | |
| 13 | + * @author owen | |
| 14 | + */ | |
| 15 | +@TableName("member_level") | |
| 16 | +@KeySequence("member_level_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | |
| 17 | +@Data | |
| 18 | +@EqualsAndHashCode(callSuper = true) | |
| 19 | +@ToString(callSuper = true) | |
| 20 | +@Builder | |
| 21 | +@NoArgsConstructor | |
| 22 | +@AllArgsConstructor | |
| 23 | +public class MemberLevelDO extends BaseDO { | |
| 24 | + | |
| 25 | + /** | |
| 26 | + * 编号 | |
| 27 | + */ | |
| 28 | + @TableId | |
| 29 | + private Long id; | |
| 30 | + /** | |
| 31 | + * 等级名称 | |
| 32 | + */ | |
| 33 | + private String name; | |
| 34 | + /** | |
| 35 | + * 升级经验 | |
| 36 | + */ | |
| 37 | + private Integer experience; | |
| 38 | + /** | |
| 39 | + * 等级 | |
| 40 | + */ | |
| 41 | + private Integer level; | |
| 42 | + /** | |
| 43 | + * 享受折扣 | |
| 44 | + */ | |
| 45 | + private Integer discount; | |
| 46 | + /** | |
| 47 | + * 等级图标 | |
| 48 | + */ | |
| 49 | + private String icon; | |
| 50 | + /** | |
| 51 | + * 等级背景图 | |
| 52 | + */ | |
| 53 | + private String backgroundUrl; | |
| 54 | + /** | |
| 55 | + * 状态 | |
| 56 | + * <p> | |
| 57 | + * 枚举 {@link CommonStatusEnum} | |
| 58 | + */ | |
| 59 | + private Integer status; | |
| 60 | + | |
| 61 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelLogDO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.dal.dataobject.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | +import com.baomidou.mybatisplus.annotation.KeySequence; | |
| 5 | +import com.baomidou.mybatisplus.annotation.TableId; | |
| 6 | +import com.baomidou.mybatisplus.annotation.TableName; | |
| 7 | +import lombok.*; | |
| 8 | + | |
| 9 | +/** | |
| 10 | + * 会员等级记录 DO | |
| 11 | + * | |
| 12 | + * @author owen | |
| 13 | + */ | |
| 14 | +@TableName("member_level_log") | |
| 15 | +@KeySequence("member_level_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | |
| 16 | +@Data | |
| 17 | +@EqualsAndHashCode(callSuper = true) | |
| 18 | +@ToString(callSuper = true) | |
| 19 | +@Builder | |
| 20 | +@NoArgsConstructor | |
| 21 | +@AllArgsConstructor | |
| 22 | +public class MemberLevelLogDO extends BaseDO { | |
| 23 | + | |
| 24 | + /** | |
| 25 | + * 编号 | |
| 26 | + */ | |
| 27 | + @TableId | |
| 28 | + private Long id; | |
| 29 | + /** | |
| 30 | + * 用户编号 | |
| 31 | + */ | |
| 32 | + private Long userId; | |
| 33 | + /** | |
| 34 | + * 等级编号 | |
| 35 | + */ | |
| 36 | + private Long levelId; | |
| 37 | + /** | |
| 38 | + * 会员等级 | |
| 39 | + */ | |
| 40 | + private Integer level; | |
| 41 | + /** | |
| 42 | + * 享受折扣 | |
| 43 | + */ | |
| 44 | + private Integer discount; | |
| 45 | + /** | |
| 46 | + * 升级经验 | |
| 47 | + */ | |
| 48 | + private Integer experience; | |
| 49 | + /** | |
| 50 | + * 会员此时的经验 | |
| 51 | + */ | |
| 52 | + private Integer userExperience; | |
| 53 | + /** | |
| 54 | + * 备注 | |
| 55 | + */ | |
| 56 | + private String remark; | |
| 57 | + /** | |
| 58 | + * 描述 | |
| 59 | + */ | |
| 60 | + private String description; | |
| 61 | + | |
| 62 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
| ... | ... | @@ -117,5 +117,14 @@ public class MemberUserDO extends TenantBaseDO { |
| 117 | 117 | @TableField(typeHandler = LongListTypeHandler.class) |
| 118 | 118 | private List<Long> tagIds; |
| 119 | 119 | |
| 120 | - // TODO 成长值、会员等级等等 | |
| 120 | + /** | |
| 121 | + * 会员级别编号 | |
| 122 | + */ | |
| 123 | + private Long levelId; | |
| 124 | + /** | |
| 125 | + * 会员经验 | |
| 126 | + */ | |
| 127 | + private Integer experience; | |
| 128 | + | |
| 129 | + // TODO 积分等等 | |
| 121 | 130 | } | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceLogMapper.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.dal.mysql.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; | |
| 6 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExportReqVO; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO; | |
| 8 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; | |
| 9 | +import org.apache.ibatis.annotations.Mapper; | |
| 10 | + | |
| 11 | +import java.util.List; | |
| 12 | + | |
| 13 | +/** | |
| 14 | + * 会员经验记录 Mapper | |
| 15 | + * | |
| 16 | + * @author owen | |
| 17 | + */ | |
| 18 | +@Mapper | |
| 19 | +public interface MemberExperienceLogMapper extends BaseMapperX<MemberExperienceLogDO> { | |
| 20 | + | |
| 21 | + default PageResult<MemberExperienceLogDO> selectPage(MemberExperienceLogPageReqVO reqVO) { | |
| 22 | + return selectPage(reqVO, new LambdaQueryWrapperX<MemberExperienceLogDO>() | |
| 23 | + .eqIfPresent(MemberExperienceLogDO::getUserId, reqVO.getUserId()) | |
| 24 | + .eqIfPresent(MemberExperienceLogDO::getBizId, reqVO.getBizId()) | |
| 25 | + .eqIfPresent(MemberExperienceLogDO::getBizType, reqVO.getBizType()) | |
| 26 | + .eqIfPresent(MemberExperienceLogDO::getTitle, reqVO.getTitle()) | |
| 27 | + .betweenIfPresent(MemberExperienceLogDO::getCreateTime, reqVO.getCreateTime()) | |
| 28 | + .orderByDesc(MemberExperienceLogDO::getId)); | |
| 29 | + } | |
| 30 | + | |
| 31 | + default List<MemberExperienceLogDO> selectList(MemberExperienceLogExportReqVO reqVO) { | |
| 32 | + return selectList(new LambdaQueryWrapperX<MemberExperienceLogDO>() | |
| 33 | + .eqIfPresent(MemberExperienceLogDO::getUserId, reqVO.getUserId()) | |
| 34 | + .eqIfPresent(MemberExperienceLogDO::getBizId, reqVO.getBizId()) | |
| 35 | + .eqIfPresent(MemberExperienceLogDO::getBizType, reqVO.getBizType()) | |
| 36 | + .eqIfPresent(MemberExperienceLogDO::getTitle, reqVO.getTitle()) | |
| 37 | + .betweenIfPresent(MemberExperienceLogDO::getCreateTime, reqVO.getCreateTime()) | |
| 38 | + .orderByDesc(MemberExperienceLogDO::getId)); | |
| 39 | + } | |
| 40 | + | |
| 41 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelLogMapper.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.dal.mysql.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; | |
| 6 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExportReqVO; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO; | |
| 8 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; | |
| 9 | +import org.apache.ibatis.annotations.Mapper; | |
| 10 | + | |
| 11 | +import java.util.List; | |
| 12 | + | |
| 13 | +/** | |
| 14 | + * 会员等级记录 Mapper | |
| 15 | + * | |
| 16 | + * @author owen | |
| 17 | + */ | |
| 18 | +@Mapper | |
| 19 | +public interface MemberLevelLogMapper extends BaseMapperX<MemberLevelLogDO> { | |
| 20 | + | |
| 21 | + default PageResult<MemberLevelLogDO> selectPage(MemberLevelLogPageReqVO reqVO) { | |
| 22 | + return selectPage(reqVO, new LambdaQueryWrapperX<MemberLevelLogDO>() | |
| 23 | + .eqIfPresent(MemberLevelLogDO::getUserId, reqVO.getUserId()) | |
| 24 | + .eqIfPresent(MemberLevelLogDO::getLevelId, reqVO.getLevelId()) | |
| 25 | + .betweenIfPresent(MemberLevelLogDO::getCreateTime, reqVO.getCreateTime()) | |
| 26 | + .orderByDesc(MemberLevelLogDO::getId)); | |
| 27 | + } | |
| 28 | + | |
| 29 | + default List<MemberLevelLogDO> selectList(MemberLevelLogExportReqVO reqVO) { | |
| 30 | + return selectList(new LambdaQueryWrapperX<MemberLevelLogDO>() | |
| 31 | + .eqIfPresent(MemberLevelLogDO::getUserId, reqVO.getUserId()) | |
| 32 | + .eqIfPresent(MemberLevelLogDO::getLevelId, reqVO.getLevelId()) | |
| 33 | + .betweenIfPresent(MemberLevelLogDO::getCreateTime, reqVO.getCreateTime()) | |
| 34 | + .orderByDesc(MemberLevelLogDO::getId)); | |
| 35 | + } | |
| 36 | + | |
| 37 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelMapper.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.dal.mysql.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; | |
| 6 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelPageReqVO; | |
| 7 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; | |
| 8 | +import org.apache.ibatis.annotations.Mapper; | |
| 9 | + | |
| 10 | +import java.util.List; | |
| 11 | + | |
| 12 | +/** | |
| 13 | + * 会员等级 Mapper | |
| 14 | + * | |
| 15 | + * @author owen | |
| 16 | + */ | |
| 17 | +@Mapper | |
| 18 | +public interface MemberLevelMapper extends BaseMapperX<MemberLevelDO> { | |
| 19 | + | |
| 20 | + default PageResult<MemberLevelDO> selectPage(MemberLevelPageReqVO reqVO) { | |
| 21 | + return selectPage(reqVO, new LambdaQueryWrapperX<MemberLevelDO>() | |
| 22 | + .likeIfPresent(MemberLevelDO::getName, reqVO.getName()) | |
| 23 | + .eqIfPresent(MemberLevelDO::getStatus, reqVO.getStatus()) | |
| 24 | + .orderByAsc(MemberLevelDO::getLevel)); | |
| 25 | + } | |
| 26 | + | |
| 27 | + | |
| 28 | + default List<MemberLevelDO> selectListByStatus(Integer status) { | |
| 29 | + return selectList(new LambdaQueryWrapperX<MemberLevelDO>() | |
| 30 | + .eq(MemberLevelDO::getStatus, status) | |
| 31 | + .orderByAsc(MemberLevelDO::getLevel)); | |
| 32 | + } | |
| 33 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/tag/MemberTagMapper.java
| ... | ... | @@ -22,9 +22,7 @@ public interface MemberTagMapper extends BaseMapperX<MemberTagDO> { |
| 22 | 22 | .orderByDesc(MemberTagDO::getId)); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - default boolean exists(Long id, String name) { | |
| 26 | - return exists(new LambdaQueryWrapperX<MemberTagDO>() | |
| 27 | - .neIfPresent(MemberTagDO::getId, id) | |
| 28 | - .eq(MemberTagDO::getName, name)); | |
| 25 | + default MemberTagDO selelctByName(String name) { | |
| 26 | + return selectOne(MemberTagDO::getName, name); | |
| 29 | 27 | } |
| 30 | 28 | } | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
| ... | ... | @@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; |
| 7 | 7 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
| 8 | 8 | import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; |
| 9 | 9 | import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; |
| 10 | +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; | |
| 10 | 11 | import org.apache.ibatis.annotations.Mapper; |
| 11 | 12 | |
| 12 | 13 | import java.util.List; |
| ... | ... | @@ -43,8 +44,21 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> { |
| 43 | 44 | .betweenIfPresent(MemberUserDO::getLoginDate, reqVO.getLoginDate()) |
| 44 | 45 | .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname()) |
| 45 | 46 | .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime()) |
| 47 | + .eqIfPresent(MemberUserDO::getLevelId, reqVO.getLevelId()) | |
| 46 | 48 | .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql) |
| 47 | 49 | .orderByDesc(MemberUserDO::getId)); |
| 48 | 50 | } |
| 49 | 51 | |
| 52 | + /** | |
| 53 | + * 取消会员的等级 | |
| 54 | + * | |
| 55 | + * @param userId 会员编号 | |
| 56 | + * @return 受影响的行数 | |
| 57 | + */ | |
| 58 | + default int cancelUserLevel(Long userId) { | |
| 59 | + return update(null, new LambdaUpdateWrapper<MemberUserDO>() | |
| 60 | + .eq(MemberUserDO::getId, userId) | |
| 61 | + .set(MemberUserDO::getExperience, 0) | |
| 62 | + .set(MemberUserDO::getLevelId, null)); | |
| 63 | + } | |
| 50 | 64 | } | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExportReqVO; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO; | |
| 6 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; | |
| 7 | +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; | |
| 8 | + | |
| 9 | +import java.util.Collection; | |
| 10 | +import java.util.List; | |
| 11 | + | |
| 12 | +/** | |
| 13 | + * 会员经验记录 Service 接口 | |
| 14 | + * | |
| 15 | + * @author owen | |
| 16 | + */ | |
| 17 | +public interface MemberExperienceLogService { | |
| 18 | + | |
| 19 | + /** | |
| 20 | + * 删除会员经验记录 | |
| 21 | + * | |
| 22 | + * @param id 编号 | |
| 23 | + */ | |
| 24 | + void deleteExperienceLog(Long id); | |
| 25 | + | |
| 26 | + /** | |
| 27 | + * 获得会员经验记录 | |
| 28 | + * | |
| 29 | + * @param id 编号 | |
| 30 | + * @return 会员经验记录 | |
| 31 | + */ | |
| 32 | + MemberExperienceLogDO getExperienceLog(Long id); | |
| 33 | + | |
| 34 | + /** | |
| 35 | + * 获得会员经验记录列表 | |
| 36 | + * | |
| 37 | + * @param ids 编号 | |
| 38 | + * @return 会员经验记录列表 | |
| 39 | + */ | |
| 40 | + List<MemberExperienceLogDO> getExperienceLogList(Collection<Long> ids); | |
| 41 | + | |
| 42 | + /** | |
| 43 | + * 获得会员经验记录分页 | |
| 44 | + * | |
| 45 | + * @param pageReqVO 分页查询 | |
| 46 | + * @return 会员经验记录分页 | |
| 47 | + */ | |
| 48 | + PageResult<MemberExperienceLogDO> getExperienceLogPage(MemberExperienceLogPageReqVO pageReqVO); | |
| 49 | + | |
| 50 | + /** | |
| 51 | + * 获得会员经验记录列表, 用于 Excel 导出 | |
| 52 | + * | |
| 53 | + * @param exportReqVO 查询条件 | |
| 54 | + * @return 会员经验记录列表 | |
| 55 | + */ | |
| 56 | + List<MemberExperienceLogDO> getExperienceLogList(MemberExperienceLogExportReqVO exportReqVO); | |
| 57 | + | |
| 58 | + /** | |
| 59 | + * 创建 手动调整 经验变动记录 | |
| 60 | + * | |
| 61 | + * @param userId 会员编号 | |
| 62 | + * @param experience 变动经验值 | |
| 63 | + * @param totalExperience 会员当前的经验 | |
| 64 | + */ | |
| 65 | + void createAdjustLog(Long userId, int experience, int totalExperience); | |
| 66 | + | |
| 67 | + /** | |
| 68 | + * 根据业务类型, 创建 经验变动记录 | |
| 69 | + * | |
| 70 | + * @param userId 会员编号 | |
| 71 | + * @param experience 变动经验值 | |
| 72 | + * @param totalExperience 会员当前的经验 | |
| 73 | + * @param bizType 业务类型 | |
| 74 | + * @param bizId 业务ID | |
| 75 | + */ | |
| 76 | + void createBizLog(Long userId, int experience, int totalExperience, MemberExperienceBizTypeEnum bizType, String bizId); | |
| 77 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogServiceImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.level; | |
| 2 | + | |
| 3 | +import cn.hutool.core.util.StrUtil; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExportReqVO; | |
| 6 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO; | |
| 7 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; | |
| 8 | +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberExperienceLogMapper; | |
| 9 | +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; | |
| 10 | +import org.springframework.stereotype.Service; | |
| 11 | +import org.springframework.validation.annotation.Validated; | |
| 12 | + | |
| 13 | +import javax.annotation.Resource; | |
| 14 | +import java.util.Collection; | |
| 15 | +import java.util.List; | |
| 16 | + | |
| 17 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 18 | +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.EXPERIENCE_LOG_NOT_EXISTS; | |
| 19 | + | |
| 20 | +/** | |
| 21 | + * 会员经验记录 Service 实现类 | |
| 22 | + * | |
| 23 | + * @author owen | |
| 24 | + */ | |
| 25 | +@Service | |
| 26 | +@Validated | |
| 27 | +public class MemberExperienceLogServiceImpl implements MemberExperienceLogService { | |
| 28 | + | |
| 29 | + @Resource | |
| 30 | + private MemberExperienceLogMapper experienceLogMapper; | |
| 31 | + | |
| 32 | + @Override | |
| 33 | + public void deleteExperienceLog(Long id) { | |
| 34 | + // 校验存在 | |
| 35 | + validateExperienceLogExists(id); | |
| 36 | + // 删除 | |
| 37 | + experienceLogMapper.deleteById(id); | |
| 38 | + } | |
| 39 | + | |
| 40 | + private void validateExperienceLogExists(Long id) { | |
| 41 | + if (experienceLogMapper.selectById(id) == null) { | |
| 42 | + throw exception(EXPERIENCE_LOG_NOT_EXISTS); | |
| 43 | + } | |
| 44 | + } | |
| 45 | + | |
| 46 | + @Override | |
| 47 | + public MemberExperienceLogDO getExperienceLog(Long id) { | |
| 48 | + return experienceLogMapper.selectById(id); | |
| 49 | + } | |
| 50 | + | |
| 51 | + @Override | |
| 52 | + public List<MemberExperienceLogDO> getExperienceLogList(Collection<Long> ids) { | |
| 53 | + return experienceLogMapper.selectBatchIds(ids); | |
| 54 | + } | |
| 55 | + | |
| 56 | + @Override | |
| 57 | + public PageResult<MemberExperienceLogDO> getExperienceLogPage(MemberExperienceLogPageReqVO pageReqVO) { | |
| 58 | + return experienceLogMapper.selectPage(pageReqVO); | |
| 59 | + } | |
| 60 | + | |
| 61 | + @Override | |
| 62 | + public List<MemberExperienceLogDO> getExperienceLogList(MemberExperienceLogExportReqVO exportReqVO) { | |
| 63 | + return experienceLogMapper.selectList(exportReqVO); | |
| 64 | + } | |
| 65 | + | |
| 66 | + @Override | |
| 67 | + public void createAdjustLog(Long userId, int experience, int totalExperience) { | |
| 68 | + // 管理员调整时, 没有业务编号, 记录对应的枚举值 | |
| 69 | + String bizId = MemberExperienceBizTypeEnum.ADMIN.getValue() + ""; | |
| 70 | + this.createBizLog(userId, experience, totalExperience, MemberExperienceBizTypeEnum.ADMIN, bizId); | |
| 71 | + } | |
| 72 | + | |
| 73 | + @Override | |
| 74 | + public void createBizLog(Long userId, int experience, int totalExperience, MemberExperienceBizTypeEnum bizType, String bizId) { | |
| 75 | + MemberExperienceLogDO experienceLogDO = new MemberExperienceLogDO(); | |
| 76 | + experienceLogDO.setUserId(userId); | |
| 77 | + experienceLogDO.setExperience(experience); | |
| 78 | + experienceLogDO.setTotalExperience(totalExperience); | |
| 79 | + experienceLogDO.setBizId(bizId); | |
| 80 | + experienceLogDO.setBizType(bizType.getValue()); | |
| 81 | + experienceLogDO.setTitle(bizType.getTitle()); | |
| 82 | + experienceLogDO.setDescription(StrUtil.format(bizType.getDesc(), experience)); | |
| 83 | + experienceLogMapper.insert(experienceLogDO); | |
| 84 | + } | |
| 85 | + | |
| 86 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExportReqVO; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO; | |
| 6 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; | |
| 7 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; | |
| 8 | +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | |
| 9 | + | |
| 10 | +import java.util.Collection; | |
| 11 | +import java.util.List; | |
| 12 | + | |
| 13 | +/** | |
| 14 | + * 会员等级记录 Service 接口 | |
| 15 | + * | |
| 16 | + * @author owen | |
| 17 | + */ | |
| 18 | +public interface MemberLevelLogService { | |
| 19 | + | |
| 20 | + /** | |
| 21 | + * 删除会员等级记录 | |
| 22 | + * | |
| 23 | + * @param id 编号 | |
| 24 | + */ | |
| 25 | + void deleteLevelLog(Long id); | |
| 26 | + | |
| 27 | + /** | |
| 28 | + * 获得会员等级记录 | |
| 29 | + * | |
| 30 | + * @param id 编号 | |
| 31 | + * @return 会员等级记录 | |
| 32 | + */ | |
| 33 | + MemberLevelLogDO getLevelLog(Long id); | |
| 34 | + | |
| 35 | + /** | |
| 36 | + * 获得会员等级记录列表 | |
| 37 | + * | |
| 38 | + * @param ids 编号 | |
| 39 | + * @return 会员等级记录列表 | |
| 40 | + */ | |
| 41 | + List<MemberLevelLogDO> getLevelLogList(Collection<Long> ids); | |
| 42 | + | |
| 43 | + /** | |
| 44 | + * 获得会员等级记录分页 | |
| 45 | + * | |
| 46 | + * @param pageReqVO 分页查询 | |
| 47 | + * @return 会员等级记录分页 | |
| 48 | + */ | |
| 49 | + PageResult<MemberLevelLogDO> getLevelLogPage(MemberLevelLogPageReqVO pageReqVO); | |
| 50 | + | |
| 51 | + /** | |
| 52 | + * 获得会员等级记录列表, 用于 Excel 导出 | |
| 53 | + * | |
| 54 | + * @param exportReqVO 查询条件 | |
| 55 | + * @return 会员等级记录列表 | |
| 56 | + */ | |
| 57 | + List<MemberLevelLogDO> getLevelLogList(MemberLevelLogExportReqVO exportReqVO); | |
| 58 | + | |
| 59 | + /** | |
| 60 | + * 创建记录: 取消等级 | |
| 61 | + * | |
| 62 | + * @param userId 会员编号 | |
| 63 | + * @param reason 调整原因 | |
| 64 | + */ | |
| 65 | + void createCancelLog(Long userId, String reason); | |
| 66 | + | |
| 67 | + /** | |
| 68 | + * 创建记录: 手动调整 | |
| 69 | + * | |
| 70 | + * @param user 会员 | |
| 71 | + * @param level 等级 | |
| 72 | + * @param experience 变动经验值 | |
| 73 | + * @param reason 调整原因 | |
| 74 | + */ | |
| 75 | + void createAdjustLog(MemberUserDO user, MemberLevelDO level, int experience, String reason); | |
| 76 | + | |
| 77 | + /** | |
| 78 | + * 创建记录: 自动升级 | |
| 79 | + * | |
| 80 | + * @param user 会员 | |
| 81 | + * @param level 等级 | |
| 82 | + */ | |
| 83 | + void createAutoUpgradeLog(MemberUserDO user, MemberLevelDO level); | |
| 84 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExportReqVO; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO; | |
| 6 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; | |
| 7 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; | |
| 8 | +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | |
| 9 | +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelLogMapper; | |
| 10 | +import org.springframework.stereotype.Service; | |
| 11 | +import org.springframework.validation.annotation.Validated; | |
| 12 | + | |
| 13 | +import javax.annotation.Resource; | |
| 14 | +import java.util.Collection; | |
| 15 | +import java.util.List; | |
| 16 | + | |
| 17 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 18 | +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.LEVEL_LOG_NOT_EXISTS; | |
| 19 | + | |
| 20 | +/** | |
| 21 | + * 会员等级记录 Service 实现类 | |
| 22 | + * | |
| 23 | + * @author owen | |
| 24 | + */ | |
| 25 | +@Service | |
| 26 | +@Validated | |
| 27 | +public class MemberLevelLogServiceImpl implements MemberLevelLogService { | |
| 28 | + | |
| 29 | + @Resource | |
| 30 | + private MemberLevelLogMapper levelLogMapper; | |
| 31 | + | |
| 32 | + @Override | |
| 33 | + public void deleteLevelLog(Long id) { | |
| 34 | + // 校验存在 | |
| 35 | + validateLevelLogExists(id); | |
| 36 | + // 删除 | |
| 37 | + levelLogMapper.deleteById(id); | |
| 38 | + } | |
| 39 | + | |
| 40 | + private void validateLevelLogExists(Long id) { | |
| 41 | + if (levelLogMapper.selectById(id) == null) { | |
| 42 | + throw exception(LEVEL_LOG_NOT_EXISTS); | |
| 43 | + } | |
| 44 | + } | |
| 45 | + | |
| 46 | + @Override | |
| 47 | + public MemberLevelLogDO getLevelLog(Long id) { | |
| 48 | + return levelLogMapper.selectById(id); | |
| 49 | + } | |
| 50 | + | |
| 51 | + @Override | |
| 52 | + public List<MemberLevelLogDO> getLevelLogList(Collection<Long> ids) { | |
| 53 | + return levelLogMapper.selectBatchIds(ids); | |
| 54 | + } | |
| 55 | + | |
| 56 | + @Override | |
| 57 | + public PageResult<MemberLevelLogDO> getLevelLogPage(MemberLevelLogPageReqVO pageReqVO) { | |
| 58 | + return levelLogMapper.selectPage(pageReqVO); | |
| 59 | + } | |
| 60 | + | |
| 61 | + @Override | |
| 62 | + public List<MemberLevelLogDO> getLevelLogList(MemberLevelLogExportReqVO exportReqVO) { | |
| 63 | + return levelLogMapper.selectList(exportReqVO); | |
| 64 | + } | |
| 65 | + | |
| 66 | + @Override | |
| 67 | + public void createCancelLog(Long userId, String reason) { | |
| 68 | + MemberLevelLogDO levelLogDO = new MemberLevelLogDO(); | |
| 69 | + levelLogDO.setUserId(userId); | |
| 70 | + levelLogDO.setRemark(reason); | |
| 71 | + levelLogDO.setDescription("管理员取消"); | |
| 72 | + levelLogMapper.insert(levelLogDO); | |
| 73 | + | |
| 74 | + // 给会员发送等级变动消息 | |
| 75 | + notifyMember(userId, levelLogDO); | |
| 76 | + } | |
| 77 | + | |
| 78 | + @Override | |
| 79 | + public void createAdjustLog(MemberUserDO user, MemberLevelDO level, int experience, String reason) { | |
| 80 | + MemberLevelLogDO levelLogDO = new MemberLevelLogDO(); | |
| 81 | + levelLogDO.setUserId(user.getId()); | |
| 82 | + levelLogDO.setLevelId(level.getId()); | |
| 83 | + levelLogDO.setLevel(level.getLevel()); | |
| 84 | + levelLogDO.setDiscount(level.getDiscount()); | |
| 85 | + levelLogDO.setUserExperience(level.getExperience()); | |
| 86 | + levelLogDO.setExperience(experience); | |
| 87 | + levelLogDO.setRemark(reason); | |
| 88 | + levelLogDO.setDescription("管理员调整为:" + level.getName()); | |
| 89 | + levelLogMapper.insert(levelLogDO); | |
| 90 | + | |
| 91 | + // 给会员发送等级变动消息 | |
| 92 | + notifyMember(user.getId(), levelLogDO); | |
| 93 | + } | |
| 94 | + | |
| 95 | + @Override | |
| 96 | + public void createAutoUpgradeLog(MemberUserDO user, MemberLevelDO level) { | |
| 97 | + MemberLevelLogDO levelLogDO = new MemberLevelLogDO(); | |
| 98 | + levelLogDO.setUserId(user.getId()); | |
| 99 | + levelLogDO.setLevelId(level.getId()); | |
| 100 | + levelLogDO.setLevel(level.getLevel()); | |
| 101 | + levelLogDO.setDiscount(level.getDiscount()); | |
| 102 | + levelLogDO.setExperience(level.getExperience()); | |
| 103 | + levelLogDO.setUserExperience(user.getExperience()); | |
| 104 | + levelLogDO.setDescription("成为:" + level.getName()); | |
| 105 | + levelLogMapper.insert(levelLogDO); | |
| 106 | + | |
| 107 | + // 给会员发送等级变动消息 | |
| 108 | + notifyMember(user.getId(), levelLogDO); | |
| 109 | + } | |
| 110 | + | |
| 111 | + private void notifyMember(Long userId, MemberLevelLogDO level) { | |
| 112 | + //todo: 给会员发消息 | |
| 113 | + } | |
| 114 | + | |
| 115 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelCreateReqVO; | |
| 6 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelPageReqVO; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelUpdateReqVO; | |
| 8 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; | |
| 9 | +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | |
| 10 | +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; | |
| 11 | + | |
| 12 | +import javax.annotation.Nullable; | |
| 13 | +import javax.validation.Valid; | |
| 14 | +import java.util.Collection; | |
| 15 | +import java.util.List; | |
| 16 | + | |
| 17 | +/** | |
| 18 | + * 会员等级 Service 接口 | |
| 19 | + * | |
| 20 | + * @author owen | |
| 21 | + */ | |
| 22 | +public interface MemberLevelService { | |
| 23 | + | |
| 24 | + /** | |
| 25 | + * 创建会员等级 | |
| 26 | + * | |
| 27 | + * @param createReqVO 创建信息 | |
| 28 | + * @return 编号 | |
| 29 | + */ | |
| 30 | + Long createLevel(@Valid MemberLevelCreateReqVO createReqVO); | |
| 31 | + | |
| 32 | + /** | |
| 33 | + * 更新会员等级 | |
| 34 | + * | |
| 35 | + * @param updateReqVO 更新信息 | |
| 36 | + */ | |
| 37 | + void updateLevel(@Valid MemberLevelUpdateReqVO updateReqVO); | |
| 38 | + | |
| 39 | + /** | |
| 40 | + * 删除会员等级 | |
| 41 | + * | |
| 42 | + * @param id 编号 | |
| 43 | + */ | |
| 44 | + void deleteLevel(Long id); | |
| 45 | + | |
| 46 | + /** | |
| 47 | + * 获得会员等级 | |
| 48 | + * | |
| 49 | + * @param id 编号 | |
| 50 | + * @return 会员等级 | |
| 51 | + */ | |
| 52 | + MemberLevelDO getLevel(Long id); | |
| 53 | + | |
| 54 | + /** | |
| 55 | + * 获得会员等级列表 | |
| 56 | + * | |
| 57 | + * @param ids 编号 | |
| 58 | + * @return 会员等级列表 | |
| 59 | + */ | |
| 60 | + List<MemberLevelDO> getLevelList(Collection<Long> ids); | |
| 61 | + | |
| 62 | + /** | |
| 63 | + * 获得会员等级分页 | |
| 64 | + * | |
| 65 | + * @param pageReqVO 分页查询 | |
| 66 | + * @return 会员等级分页 | |
| 67 | + */ | |
| 68 | + PageResult<MemberLevelDO> getLevelPage(MemberLevelPageReqVO pageReqVO); | |
| 69 | + | |
| 70 | + | |
| 71 | + /** | |
| 72 | + * 获得指定状态的会员等级列表 | |
| 73 | + * | |
| 74 | + * @param status 状态 | |
| 75 | + * @return 会员等级列表 | |
| 76 | + */ | |
| 77 | + List<MemberLevelDO> getLevelListByStatus(Integer status); | |
| 78 | + | |
| 79 | + | |
| 80 | + /** | |
| 81 | + * 获得开启状态的会员等级列表 | |
| 82 | + * | |
| 83 | + * @return 会员等级列表 | |
| 84 | + */ | |
| 85 | + default List<MemberLevelDO> getEnableLevelList() { | |
| 86 | + return getLevelListByStatus(CommonStatusEnum.ENABLE.getStatus()); | |
| 87 | + } | |
| 88 | + | |
| 89 | + /** | |
| 90 | + * 修改会员的等级 | |
| 91 | + * | |
| 92 | + * @param user 会员 | |
| 93 | + * @param levelId 要修改的等级编号,编号为空时,代表取消会员的等级 | |
| 94 | + * @param levelReason 修改原因 | |
| 95 | + */ | |
| 96 | + void updateUserLevel(MemberUserDO user, @Nullable Long levelId, String levelReason); | |
| 97 | + | |
| 98 | + /** | |
| 99 | + * 增加会员经验 | |
| 100 | + * | |
| 101 | + * @param userId 会员ID | |
| 102 | + * @param experience 经验 | |
| 103 | + * @param bizType 业务类型 | |
| 104 | + * @param bizId 业务编号 | |
| 105 | + */ | |
| 106 | + void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId); | |
| 107 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.level; | |
| 2 | + | |
| 3 | +import cn.hutool.core.collection.CollUtil; | |
| 4 | +import cn.hutool.core.util.NumberUtil; | |
| 5 | +import cn.hutool.core.util.ObjUtil; | |
| 6 | +import cn.hutool.core.util.ObjectUtil; | |
| 7 | +import cn.hutool.core.util.StrUtil; | |
| 8 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 9 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelCreateReqVO; | |
| 10 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelPageReqVO; | |
| 11 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelUpdateReqVO; | |
| 12 | +import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert; | |
| 13 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; | |
| 14 | +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | |
| 15 | +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper; | |
| 16 | +import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; | |
| 17 | +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; | |
| 18 | +import com.google.common.annotations.VisibleForTesting; | |
| 19 | +import lombok.extern.slf4j.Slf4j; | |
| 20 | +import org.springframework.stereotype.Service; | |
| 21 | +import org.springframework.transaction.annotation.Transactional; | |
| 22 | +import org.springframework.validation.annotation.Validated; | |
| 23 | + | |
| 24 | +import javax.annotation.Resource; | |
| 25 | +import java.util.Collection; | |
| 26 | +import java.util.Comparator; | |
| 27 | +import java.util.List; | |
| 28 | + | |
| 29 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 30 | +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*; | |
| 31 | + | |
| 32 | +/** | |
| 33 | + * 会员等级 Service 实现类 | |
| 34 | + * | |
| 35 | + * @author owen | |
| 36 | + */ | |
| 37 | +@Slf4j | |
| 38 | +@Service | |
| 39 | +@Validated | |
| 40 | +public class MemberLevelServiceImpl implements MemberLevelService { | |
| 41 | + | |
| 42 | + @Resource | |
| 43 | + private MemberLevelMapper levelMapper; | |
| 44 | + @Resource | |
| 45 | + private MemberLevelLogService memberLevelLogService; | |
| 46 | + @Resource | |
| 47 | + private MemberExperienceLogService memberExperienceLogService; | |
| 48 | + @Resource | |
| 49 | + private MemberUserMapper memberUserMapper; | |
| 50 | + | |
| 51 | + @Override | |
| 52 | + public Long createLevel(MemberLevelCreateReqVO createReqVO) { | |
| 53 | + // 校验配置是否有效 | |
| 54 | + validateConfigValid(null, createReqVO.getName(), createReqVO.getLevel(), createReqVO.getExperience()); | |
| 55 | + | |
| 56 | + // 插入 | |
| 57 | + MemberLevelDO level = MemberLevelConvert.INSTANCE.convert(createReqVO); | |
| 58 | + levelMapper.insert(level); | |
| 59 | + // 返回 | |
| 60 | + return level.getId(); | |
| 61 | + } | |
| 62 | + | |
| 63 | + @Override | |
| 64 | + public void updateLevel(MemberLevelUpdateReqVO updateReqVO) { | |
| 65 | + // 校验存在 | |
| 66 | + validateLevelExists(updateReqVO.getId()); | |
| 67 | + // 校验配置是否有效 | |
| 68 | + validateConfigValid(updateReqVO.getId(), updateReqVO.getName(), updateReqVO.getLevel(), updateReqVO.getExperience()); | |
| 69 | + | |
| 70 | + // 更新 | |
| 71 | + MemberLevelDO updateObj = MemberLevelConvert.INSTANCE.convert(updateReqVO); | |
| 72 | + levelMapper.updateById(updateObj); | |
| 73 | + } | |
| 74 | + | |
| 75 | + @Override | |
| 76 | + public void deleteLevel(Long id) { | |
| 77 | + // 校验存在 | |
| 78 | + validateLevelExists(id); | |
| 79 | + // 删除 | |
| 80 | + levelMapper.deleteById(id); | |
| 81 | + } | |
| 82 | + | |
| 83 | + @VisibleForTesting | |
| 84 | + MemberLevelDO validateLevelExists(Long id) { | |
| 85 | + MemberLevelDO levelDO = levelMapper.selectById(id); | |
| 86 | + if (levelDO == null) { | |
| 87 | + throw exception(LEVEL_NOT_EXISTS); | |
| 88 | + } | |
| 89 | + return levelDO; | |
| 90 | + } | |
| 91 | + | |
| 92 | + @VisibleForTesting | |
| 93 | + void validateNameUnique(List<MemberLevelDO> list, Long id, String name) { | |
| 94 | + for (MemberLevelDO levelDO : list) { | |
| 95 | + if (ObjUtil.notEqual(levelDO.getName(), name)) { | |
| 96 | + continue; | |
| 97 | + } | |
| 98 | + | |
| 99 | + if (id == null || !id.equals(levelDO.getId())) { | |
| 100 | + throw exception(LEVEL_NAME_EXISTS, levelDO.getName()); | |
| 101 | + } | |
| 102 | + } | |
| 103 | + } | |
| 104 | + | |
| 105 | + @VisibleForTesting | |
| 106 | + void validateLevelUnique(List<MemberLevelDO> list, Long id, Integer level) { | |
| 107 | + for (MemberLevelDO levelDO : list) { | |
| 108 | + if (ObjUtil.notEqual(levelDO.getLevel(), level)) { | |
| 109 | + continue; | |
| 110 | + } | |
| 111 | + | |
| 112 | + if (id == null || !id.equals(levelDO.getId())) { | |
| 113 | + throw exception(LEVEL_VALUE_EXISTS, levelDO.getLevel(), levelDO.getName()); | |
| 114 | + } | |
| 115 | + } | |
| 116 | + } | |
| 117 | + | |
| 118 | + @VisibleForTesting | |
| 119 | + void validateExperienceOutRange(List<MemberLevelDO> list, Long id, Integer level, Integer experience) { | |
| 120 | + for (MemberLevelDO levelDO : list) { | |
| 121 | + if (levelDO.getId().equals(id)) { | |
| 122 | + continue; | |
| 123 | + } | |
| 124 | + | |
| 125 | + if (levelDO.getLevel() < level) { | |
| 126 | + // 经验大于前一个等级 | |
| 127 | + if (experience <= levelDO.getExperience()) { | |
| 128 | + throw exception(LEVEL_EXPERIENCE_MIN, levelDO.getName(), levelDO.getExperience()); | |
| 129 | + } | |
| 130 | + } else if (levelDO.getLevel() > level) { | |
| 131 | + //小于下一个级别 | |
| 132 | + if (experience >= levelDO.getExperience()) { | |
| 133 | + throw exception(LEVEL_EXPERIENCE_MAX, levelDO.getName(), levelDO.getExperience()); | |
| 134 | + } | |
| 135 | + } | |
| 136 | + } | |
| 137 | + } | |
| 138 | + | |
| 139 | + @VisibleForTesting | |
| 140 | + void validateConfigValid(Long id, String name, Integer level, Integer experience) { | |
| 141 | + List<MemberLevelDO> list = levelMapper.selectList(); | |
| 142 | + | |
| 143 | + // 校验名称唯一 | |
| 144 | + validateNameUnique(list, id, name); | |
| 145 | + // 校验等级唯一 | |
| 146 | + validateLevelUnique(list, id, level); | |
| 147 | + // 校验升级所需经验是否有效: 大于前一个等级,小于下一个级别 | |
| 148 | + validateExperienceOutRange(list, id, level, experience); | |
| 149 | + } | |
| 150 | + | |
| 151 | + @Override | |
| 152 | + public MemberLevelDO getLevel(Long id) { | |
| 153 | + return levelMapper.selectById(id); | |
| 154 | + } | |
| 155 | + | |
| 156 | + @Override | |
| 157 | + public List<MemberLevelDO> getLevelList(Collection<Long> ids) { | |
| 158 | + return levelMapper.selectBatchIds(ids); | |
| 159 | + } | |
| 160 | + | |
| 161 | + @Override | |
| 162 | + public PageResult<MemberLevelDO> getLevelPage(MemberLevelPageReqVO pageReqVO) { | |
| 163 | + return levelMapper.selectPage(pageReqVO); | |
| 164 | + } | |
| 165 | + | |
| 166 | + @Override | |
| 167 | + public List<MemberLevelDO> getLevelListByStatus(Integer status) { | |
| 168 | + return levelMapper.selectListByStatus(status); | |
| 169 | + } | |
| 170 | + | |
| 171 | + @Transactional(rollbackFor = Exception.class) | |
| 172 | + @Override | |
| 173 | + public void updateUserLevel(MemberUserDO user, Long levelId, String reason) { | |
| 174 | + // 未调整的情况1 | |
| 175 | + if (user.getLevelId() == null && levelId == null) { | |
| 176 | + return; | |
| 177 | + } | |
| 178 | + // 未调整的情况2 | |
| 179 | + if (ObjUtil.equal(user.getLevelId(), levelId)) { | |
| 180 | + return; | |
| 181 | + } | |
| 182 | + | |
| 183 | + // 需要后台用户填写为什么调整会员的等级 | |
| 184 | + if (StrUtil.isBlank(reason)) { | |
| 185 | + throw exception(LEVEL_REASON_NOT_EXISTS); | |
| 186 | + } | |
| 187 | + | |
| 188 | + int experience; | |
| 189 | + int totalExperience = 0; | |
| 190 | + // 记录等级变动 | |
| 191 | + if (levelId == null) { | |
| 192 | + experience = -user.getExperience(); | |
| 193 | + | |
| 194 | + // 取消了会员的等级 | |
| 195 | + memberLevelLogService.createCancelLog(user.getId(), reason); | |
| 196 | + memberUserMapper.cancelUserLevel(user.getId()); | |
| 197 | + } else { | |
| 198 | + MemberLevelDO level = validateLevelExists(levelId); | |
| 199 | + // 变动经验值 = 等级的升级经验 - 会员当前的经验;正数为增加经验,负数为扣减经验 | |
| 200 | + experience = level.getExperience() - user.getExperience(); | |
| 201 | + // 会员当前的经验 = 等级的升级经验 | |
| 202 | + totalExperience = level.getExperience(); | |
| 203 | + | |
| 204 | + memberLevelLogService.createAdjustLog(user, level, experience, reason); | |
| 205 | + | |
| 206 | + // 更新会员表上的等级编号、经验值 | |
| 207 | + updateUserLevelIdAndExperience(user.getId(), levelId, totalExperience); | |
| 208 | + } | |
| 209 | + | |
| 210 | + | |
| 211 | + // 记录会员经验变动 | |
| 212 | + memberExperienceLogService.createAdjustLog(user.getId(), experience, totalExperience); | |
| 213 | + } | |
| 214 | + | |
| 215 | + @Transactional(rollbackFor = Exception.class) | |
| 216 | + @Override | |
| 217 | + public void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) { | |
| 218 | + if (experience == 0) { | |
| 219 | + return; | |
| 220 | + } | |
| 221 | + | |
| 222 | + MemberUserDO user = memberUserMapper.selectById(userId); | |
| 223 | + if (user.getExperience() == null) { | |
| 224 | + user.setExperience(0); | |
| 225 | + } | |
| 226 | + | |
| 227 | + // 防止扣出负数 | |
| 228 | + int userExperience = NumberUtil.max(user.getExperience() + experience, 0); | |
| 229 | + | |
| 230 | + // 创建经验记录 | |
| 231 | + memberExperienceLogService.createBizLog(userId, experience, userExperience, bizType, bizId); | |
| 232 | + | |
| 233 | + // 计算会员等级 | |
| 234 | + Long levelId = calcLevel(user, userExperience); | |
| 235 | + | |
| 236 | + // 更新会员表上的等级编号、经验值 | |
| 237 | + updateUserLevelIdAndExperience(user.getId(), levelId, userExperience); | |
| 238 | + } | |
| 239 | + | |
| 240 | + private void updateUserLevelIdAndExperience(Long userId, Long levelId, Integer experience) { | |
| 241 | + memberUserMapper.updateById(new MemberUserDO() | |
| 242 | + .setId(userId) | |
| 243 | + .setLevelId(levelId).setExperience(experience) | |
| 244 | + ); | |
| 245 | + } | |
| 246 | + | |
| 247 | + /** | |
| 248 | + * 计算会员等级 | |
| 249 | + * | |
| 250 | + * @param user 会员 | |
| 251 | + * @param userExperience 会员当前的经验值 | |
| 252 | + * @return 会员等级编号,null表示无变化 | |
| 253 | + */ | |
| 254 | + private Long calcLevel(MemberUserDO user, int userExperience) { | |
| 255 | + List<MemberLevelDO> list = getEnableLevelList(); | |
| 256 | + if (CollUtil.isEmpty(list)) { | |
| 257 | + log.warn("计算会员等级失败:会员等级配置不存在"); | |
| 258 | + return null; | |
| 259 | + } | |
| 260 | + | |
| 261 | + MemberLevelDO matchLevel = list.stream() | |
| 262 | + .filter(level -> userExperience >= level.getExperience()) | |
| 263 | + .max(Comparator.nullsFirst(Comparator.comparing(MemberLevelDO::getLevel))) | |
| 264 | + .orElse(null); | |
| 265 | + if (matchLevel == null) { | |
| 266 | + log.warn("计算会员等级失败:未找到会员{}经验{}对应的等级配置", user.getId(), userExperience); | |
| 267 | + return null; | |
| 268 | + } | |
| 269 | + | |
| 270 | + // 等级没有变化 | |
| 271 | + if (ObjectUtil.equal(matchLevel.getId(), user.getLevelId())) { | |
| 272 | + return null; | |
| 273 | + } | |
| 274 | + | |
| 275 | + // 保存等级变更记录 | |
| 276 | + memberLevelLogService.createAutoUpgradeLog(user, matchLevel); | |
| 277 | + return matchLevel.getId(); | |
| 278 | + } | |
| 279 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagService.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImpl.java
| ... | ... | @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.member.service.tag; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.collection.ListUtil; |
| 5 | +import cn.hutool.core.util.StrUtil; | |
| 5 | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | 7 | import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagCreateReqVO; |
| 7 | 8 | import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagPageReqVO; |
| ... | ... | @@ -62,8 +63,6 @@ public class MemberTagServiceImpl implements MemberTagService { |
| 62 | 63 | tagMapper.deleteById(id); |
| 63 | 64 | } |
| 64 | 65 | |
| 65 | - // TODO @疯狂:校验 tag name 不重复,参考 validateMobileUnique 方法,Mapper 尽量逻辑通用,处理交给 Service | |
| 66 | - | |
| 67 | 66 | private void validateTagExists(Long id) { |
| 68 | 67 | if (tagMapper.selectById(id) == null) { |
| 69 | 68 | throw exception(TAG_NOT_EXISTS); |
| ... | ... | @@ -71,8 +70,19 @@ public class MemberTagServiceImpl implements MemberTagService { |
| 71 | 70 | } |
| 72 | 71 | |
| 73 | 72 | private void validateTagNameUnique(Long id, String name) { |
| 74 | - boolean exists = tagMapper.exists(id, name); | |
| 75 | - if (exists) { | |
| 73 | + if (StrUtil.isBlank(name)) { | |
| 74 | + return; | |
| 75 | + } | |
| 76 | + MemberTagDO tag = tagMapper.selelctByName(name); | |
| 77 | + if (tag == null) { | |
| 78 | + return; | |
| 79 | + } | |
| 80 | + | |
| 81 | + // 如果 id 为空,说明不用比较是否为相同 id 的标签 | |
| 82 | + if (id == null) { | |
| 83 | + throw exception(TAG_NAME_EXISTS); | |
| 84 | + } | |
| 85 | + if (!tag.getId().equals(id)) { | |
| 76 | 86 | throw exception(TAG_NAME_EXISTS); |
| 77 | 87 | } |
| 78 | 88 | } |
| ... | ... | @@ -95,4 +105,9 @@ public class MemberTagServiceImpl implements MemberTagService { |
| 95 | 105 | return tagMapper.selectPage(pageReqVO); |
| 96 | 106 | } |
| 97 | 107 | |
| 108 | + @Override | |
| 109 | + public List<MemberTagDO> getList() { | |
| 110 | + return tagMapper.selectList(); | |
| 111 | + } | |
| 112 | + | |
| 98 | 113 | } | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
| ... | ... | @@ -8,13 +8,14 @@ import cn.iocoder.yudao.module.infra.api.file.FileApi; |
| 8 | 8 | import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; |
| 9 | 9 | import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; |
| 10 | 10 | import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserResetPasswordReqVO; |
| 11 | +import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateMobileReqVO; | |
| 11 | 12 | import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdatePasswordReqVO; |
| 12 | 13 | import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateReqVO; |
| 13 | -import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateMobileReqVO; | |
| 14 | 14 | import cn.iocoder.yudao.module.member.convert.auth.AuthConvert; |
| 15 | 15 | import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; |
| 16 | 16 | import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; |
| 17 | 17 | import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; |
| 18 | +import cn.iocoder.yudao.module.member.service.level.MemberLevelService; | |
| 18 | 19 | import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; |
| 19 | 20 | import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; |
| 20 | 21 | import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; |
| ... | ... | @@ -55,6 +56,9 @@ public class MemberUserServiceImpl implements MemberUserService { |
| 55 | 56 | @Resource |
| 56 | 57 | private PasswordEncoder passwordEncoder; |
| 57 | 58 | |
| 59 | + @Resource | |
| 60 | + private MemberLevelService memberLevelService; | |
| 61 | + | |
| 58 | 62 | @Override |
| 59 | 63 | public MemberUserDO getUserByMobile(String mobile) { |
| 60 | 64 | return memberUserMapper.selectByMobile(mobile); |
| ... | ... | @@ -180,16 +184,20 @@ public class MemberUserServiceImpl implements MemberUserService { |
| 180 | 184 | return passwordEncoder.encode(password); |
| 181 | 185 | } |
| 182 | 186 | |
| 187 | + @Transactional(rollbackFor = Exception.class) | |
| 183 | 188 | @Override |
| 184 | 189 | public void updateUser(MemberUserUpdateReqVO updateReqVO) { |
| 185 | 190 | // 校验存在 |
| 186 | - validateUserExists(updateReqVO.getId()); | |
| 191 | + MemberUserDO user = validateUserExists(updateReqVO.getId()); | |
| 187 | 192 | // 校验手机唯一 |
| 188 | 193 | validateMobileUnique(updateReqVO.getId(), updateReqVO.getMobile()); |
| 189 | 194 | |
| 190 | 195 | // 更新 |
| 191 | 196 | MemberUserDO updateObj = MemberUserConvert.INSTANCE.convert(updateReqVO); |
| 192 | 197 | memberUserMapper.updateById(updateObj); |
| 198 | + | |
| 199 | + // 会员级别修改 | |
| 200 | + memberLevelService.updateUserLevel(user, updateReqVO.getLevelId(), updateReqVO.getLevelReason()); | |
| 193 | 201 | } |
| 194 | 202 | |
| 195 | 203 | @VisibleForTesting | ... | ... |
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.level; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; | |
| 6 | +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelCreateReqVO; | |
| 8 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelPageReqVO; | |
| 9 | +import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelUpdateReqVO; | |
| 10 | +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; | |
| 11 | +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper; | |
| 12 | +import org.junit.jupiter.api.Test; | |
| 13 | +import org.springframework.boot.test.mock.mockito.MockBean; | |
| 14 | +import org.springframework.context.annotation.Import; | |
| 15 | + | |
| 16 | +import javax.annotation.Resource; | |
| 17 | +import java.util.List; | |
| 18 | +import java.util.function.Consumer; | |
| 19 | + | |
| 20 | +import static cn.hutool.core.util.RandomUtil.randomInt; | |
| 21 | +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; | |
| 22 | +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 23 | +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; | |
| 24 | +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; | |
| 25 | +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*; | |
| 26 | +import static org.junit.jupiter.api.Assertions.*; | |
| 27 | + | |
| 28 | +/** | |
| 29 | + * {@link MemberLevelServiceImpl} 的单元测试类 | |
| 30 | + * | |
| 31 | + * @author owen | |
| 32 | + */ | |
| 33 | +@Import(MemberLevelServiceImpl.class) | |
| 34 | +public class MemberLevelServiceImplTest extends BaseDbUnitTest { | |
| 35 | + | |
| 36 | + @Resource | |
| 37 | + private MemberLevelServiceImpl levelService; | |
| 38 | + | |
| 39 | + @Resource | |
| 40 | + private MemberLevelMapper levelMapper; | |
| 41 | + | |
| 42 | + @MockBean | |
| 43 | + private MemberLevelLogService memberLevelLogService; | |
| 44 | + @MockBean | |
| 45 | + private MemberExperienceLogService memberExperienceLogService; | |
| 46 | + | |
| 47 | + @Test | |
| 48 | + public void testCreateLevel_success() { | |
| 49 | + // 准备参数 | |
| 50 | + MemberLevelCreateReqVO reqVO = randomPojo(MemberLevelCreateReqVO.class, o -> { | |
| 51 | + o.setDiscount(randomInt()); | |
| 52 | + o.setIcon(randomURL()); | |
| 53 | + o.setBackgroundUrl(randomURL()); | |
| 54 | + }); | |
| 55 | + | |
| 56 | + // 调用 | |
| 57 | + Long levelId = levelService.createLevel(reqVO); | |
| 58 | + // 断言 | |
| 59 | + assertNotNull(levelId); | |
| 60 | + // 校验记录的属性是否正确 | |
| 61 | + MemberLevelDO level = levelMapper.selectById(levelId); | |
| 62 | + assertPojoEquals(reqVO, level); | |
| 63 | + } | |
| 64 | + | |
| 65 | + @Test | |
| 66 | + public void testUpdateLevel_success() { | |
| 67 | + // mock 数据 | |
| 68 | + MemberLevelDO dbLevel = randomPojo(MemberLevelDO.class); | |
| 69 | + levelMapper.insert(dbLevel);// @Sql: 先插入出一条存在的数据 | |
| 70 | + // 准备参数 | |
| 71 | + MemberLevelUpdateReqVO reqVO = randomPojo(MemberLevelUpdateReqVO.class, o -> { | |
| 72 | + o.setId(dbLevel.getId()); // 设置更新的 ID | |
| 73 | + //以下要保持一致 | |
| 74 | + o.setName(dbLevel.getName()); | |
| 75 | + o.setLevel(dbLevel.getLevel()); | |
| 76 | + o.setExperience(dbLevel.getExperience()); | |
| 77 | + //以下是要修改的字段 | |
| 78 | + o.setDiscount(randomInt()); | |
| 79 | + o.setIcon(randomURL()); | |
| 80 | + o.setBackgroundUrl(randomURL()); | |
| 81 | + }); | |
| 82 | + | |
| 83 | + // 调用 | |
| 84 | + levelService.updateLevel(reqVO); | |
| 85 | + // 校验是否更新正确 | |
| 86 | + MemberLevelDO level = levelMapper.selectById(reqVO.getId()); // 获取最新的 | |
| 87 | + assertPojoEquals(reqVO, level); | |
| 88 | + } | |
| 89 | + | |
| 90 | + @Test | |
| 91 | + public void testUpdateLevel_notExists() { | |
| 92 | + // 准备参数 | |
| 93 | + MemberLevelUpdateReqVO reqVO = randomPojo(MemberLevelUpdateReqVO.class); | |
| 94 | + | |
| 95 | + // 调用, 并断言异常 | |
| 96 | + assertServiceException(() -> levelService.updateLevel(reqVO), LEVEL_NOT_EXISTS); | |
| 97 | + } | |
| 98 | + | |
| 99 | + @Test | |
| 100 | + public void testDeleteLevel_success() { | |
| 101 | + // mock 数据 | |
| 102 | + MemberLevelDO dbLevel = randomPojo(MemberLevelDO.class); | |
| 103 | + levelMapper.insert(dbLevel);// @Sql: 先插入出一条存在的数据 | |
| 104 | + // 准备参数 | |
| 105 | + Long id = dbLevel.getId(); | |
| 106 | + | |
| 107 | + // 调用 | |
| 108 | + levelService.deleteLevel(id); | |
| 109 | + // 校验数据不存在了 | |
| 110 | + assertNull(levelMapper.selectById(id)); | |
| 111 | + } | |
| 112 | + | |
| 113 | + @Test | |
| 114 | + public void testDeleteLevel_notExists() { | |
| 115 | + // 准备参数 | |
| 116 | + Long id = randomLongId(); | |
| 117 | + | |
| 118 | + // 调用, 并断言异常 | |
| 119 | + assertServiceException(() -> levelService.deleteLevel(id), LEVEL_NOT_EXISTS); | |
| 120 | + } | |
| 121 | + | |
| 122 | + @Test | |
| 123 | + public void testGetLevelPage() { | |
| 124 | + // mock 数据 | |
| 125 | + MemberLevelDO dbLevel = randomPojo(MemberLevelDO.class, o -> { // 等会查询到 | |
| 126 | + o.setName("黄金会员"); | |
| 127 | + o.setStatus(1); | |
| 128 | + }); | |
| 129 | + levelMapper.insert(dbLevel); | |
| 130 | + // 测试 name 不匹配 | |
| 131 | + levelMapper.insert(cloneIgnoreId(dbLevel, o -> o.setName(""))); | |
| 132 | + // 测试 status 不匹配 | |
| 133 | + levelMapper.insert(cloneIgnoreId(dbLevel, o -> o.setStatus(0))); | |
| 134 | + // 准备参数 | |
| 135 | + MemberLevelPageReqVO reqVO = new MemberLevelPageReqVO(); | |
| 136 | + reqVO.setName("黄金会员"); | |
| 137 | + reqVO.setStatus(1); | |
| 138 | + | |
| 139 | + // 调用 | |
| 140 | + PageResult<MemberLevelDO> pageResult = levelService.getLevelPage(reqVO); | |
| 141 | + // 断言 | |
| 142 | + assertEquals(1, pageResult.getTotal()); | |
| 143 | + assertEquals(1, pageResult.getList().size()); | |
| 144 | + assertPojoEquals(dbLevel, pageResult.getList().get(0)); | |
| 145 | + } | |
| 146 | + | |
| 147 | + @Test | |
| 148 | + public void testCreateLevel_nameUnique() { | |
| 149 | + // 准备参数 | |
| 150 | + String name = randomString(); | |
| 151 | + | |
| 152 | + // mock 数据 | |
| 153 | + levelMapper.insert(randomLevelDO(o -> o.setName(name))); | |
| 154 | + | |
| 155 | + // 调用,校验异常 | |
| 156 | + List<MemberLevelDO> list = levelMapper.selectList(); | |
| 157 | + assertServiceException(() -> levelService.validateNameUnique(list, null, name), LEVEL_NAME_EXISTS, name); | |
| 158 | + } | |
| 159 | + | |
| 160 | + @Test | |
| 161 | + public void testUpdateLevel_nameUnique() { | |
| 162 | + // 准备参数 | |
| 163 | + Long id = randomLongId(); | |
| 164 | + String name = randomString(); | |
| 165 | + | |
| 166 | + // mock 数据 | |
| 167 | + levelMapper.insert(randomLevelDO(o -> o.setName(name))); | |
| 168 | + | |
| 169 | + // 调用,校验异常 | |
| 170 | + List<MemberLevelDO> list = levelMapper.selectList(); | |
| 171 | + assertServiceException(() -> levelService.validateNameUnique(list, id, name), LEVEL_NAME_EXISTS, name); | |
| 172 | + } | |
| 173 | + | |
| 174 | + @Test | |
| 175 | + public void testCreateLevel_levelUnique() { | |
| 176 | + // 准备参数 | |
| 177 | + Integer level = randomInteger(); | |
| 178 | + String name = randomString(); | |
| 179 | + | |
| 180 | + // mock 数据 | |
| 181 | + levelMapper.insert(randomLevelDO(o -> { | |
| 182 | + o.setLevel(level); | |
| 183 | + o.setName(name); | |
| 184 | + })); | |
| 185 | + | |
| 186 | + // 调用,校验异常 | |
| 187 | + List<MemberLevelDO> list = levelMapper.selectList(); | |
| 188 | + assertServiceException(() -> levelService.validateLevelUnique(list, null, level), LEVEL_VALUE_EXISTS, level, name); | |
| 189 | + } | |
| 190 | + | |
| 191 | + @Test | |
| 192 | + public void testUpdateLevel_levelUnique() { | |
| 193 | + // 准备参数 | |
| 194 | + Long id = randomLongId(); | |
| 195 | + Integer level = randomInteger(); | |
| 196 | + String name = randomString(); | |
| 197 | + | |
| 198 | + // mock 数据 | |
| 199 | + levelMapper.insert(randomLevelDO(o -> { | |
| 200 | + o.setLevel(level); | |
| 201 | + o.setName(name); | |
| 202 | + })); | |
| 203 | + | |
| 204 | + // 调用,校验异常 | |
| 205 | + List<MemberLevelDO> list = levelMapper.selectList(); | |
| 206 | + assertServiceException(() -> levelService.validateLevelUnique(list, id, level), LEVEL_VALUE_EXISTS, level, name); | |
| 207 | + } | |
| 208 | + | |
| 209 | + @Test | |
| 210 | + public void testCreateLevel_experienceOutRange() { | |
| 211 | + // 准备参数 | |
| 212 | + int level = 10; | |
| 213 | + int experience = 10; | |
| 214 | + String name = randomString(); | |
| 215 | + | |
| 216 | + // mock 数据 | |
| 217 | + levelMapper.insert(randomLevelDO(o -> { | |
| 218 | + o.setLevel(level); | |
| 219 | + o.setExperience(experience); | |
| 220 | + o.setName(name); | |
| 221 | + })); | |
| 222 | + List<MemberLevelDO> list = levelMapper.selectList(); | |
| 223 | + | |
| 224 | + // 调用,校验异常 | |
| 225 | + assertServiceException(() -> levelService.validateExperienceOutRange(list, null, level + 1, experience - 1), LEVEL_EXPERIENCE_MIN, name, level); | |
| 226 | + // 调用,校验异常 | |
| 227 | + assertServiceException(() -> levelService.validateExperienceOutRange(list, null, level - 1, experience + 1), LEVEL_EXPERIENCE_MAX, name, level); | |
| 228 | + } | |
| 229 | + | |
| 230 | + @Test | |
| 231 | + public void testUpdateLevel_experienceOutRange() { | |
| 232 | + // 准备参数 | |
| 233 | + int level = 10; | |
| 234 | + int experience = 10; | |
| 235 | + Long id = randomLongId(); | |
| 236 | + String name = randomString(); | |
| 237 | + | |
| 238 | + // mock 数据 | |
| 239 | + levelMapper.insert(randomLevelDO(o -> { | |
| 240 | + o.setLevel(level); | |
| 241 | + o.setExperience(experience); | |
| 242 | + o.setName(name); | |
| 243 | + })); | |
| 244 | + List<MemberLevelDO> list = levelMapper.selectList(); | |
| 245 | + | |
| 246 | + // 调用,校验异常 | |
| 247 | + assertServiceException(() -> levelService.validateExperienceOutRange(list, id, level + 1, experience - 1), LEVEL_EXPERIENCE_MIN, name, level); | |
| 248 | + // 调用,校验异常 | |
| 249 | + assertServiceException(() -> levelService.validateExperienceOutRange(list, id, level - 1, experience + 1), LEVEL_EXPERIENCE_MAX, name, level); | |
| 250 | + } | |
| 251 | + | |
| 252 | + // ========== 随机对象 ========== | |
| 253 | + | |
| 254 | + @SafeVarargs | |
| 255 | + private static MemberLevelDO randomLevelDO(Consumer<MemberLevelDO>... consumers) { | |
| 256 | + Consumer<MemberLevelDO> consumer = (o) -> { | |
| 257 | + o.setStatus(CommonStatusEnum.ENABLE.getStatus()); | |
| 258 | + o.setDiscount(randomInt(0, 100)); | |
| 259 | + o.setIcon(randomURL()); | |
| 260 | + o.setBackgroundUrl(randomURL()); | |
| 261 | + }; | |
| 262 | + return randomPojo(MemberLevelDO.class, ArrayUtils.append(consumer, consumers)); | |
| 263 | + } | |
| 264 | +} | ... | ... |
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/clean.sql
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
| ... | ... | @@ -44,4 +44,23 @@ CREATE TABLE IF NOT EXISTS "member_tag" |
| 44 | 44 | "deleted" bit NOT NULL DEFAULT FALSE, |
| 45 | 45 | "tenant_id" bigint NOT NULL default '0', |
| 46 | 46 | PRIMARY KEY ("id") |
| 47 | -) COMMENT '会员标签'; | |
| 48 | 47 | \ No newline at end of file |
| 48 | +) COMMENT '会员标签'; | |
| 49 | + | |
| 50 | +CREATE TABLE IF NOT EXISTS "member_level" | |
| 51 | +( | |
| 52 | + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, | |
| 53 | + "name" varchar NOT NULL, | |
| 54 | + "experience" int NOT NULL, | |
| 55 | + "level" int NOT NULL, | |
| 56 | + "discount" int NOT NULL, | |
| 57 | + "icon" varchar NOT NULL, | |
| 58 | + "background_url" varchar NOT NULL, | |
| 59 | + "creator" varchar DEFAULT '', | |
| 60 | + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, | |
| 61 | + "updater" varchar DEFAULT '', | |
| 62 | + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, | |
| 63 | + "deleted" bit NOT NULL DEFAULT FALSE, | |
| 64 | + "tenant_id" bigint not null default '0', | |
| 65 | + "status" int NOT NULL, | |
| 66 | + PRIMARY KEY ("id") | |
| 67 | +) COMMENT '会员等级'; | |
| 49 | 68 | \ No newline at end of file | ... | ... |