BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 2f7371b4ea215040c2fec14d67cf84895649ba7f

Authored by puhui999
1 parent f18a4741

签到记录：完善 review 提到的问题

Inline Side-by-side
Showing 3 changed files with 150 additions and 99 deletions
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
  View file @2f7371b
1 1 package cn.iocoder.yudao.module.member.convert.signin;
2 2  
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.util.ObjUtil;
3 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 6 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
5 7 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 8 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO;
7 9 import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
8 11 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
9 12 import org.mapstruct.Mapper;
10 13 import org.mapstruct.factory.Mappers;
11 14  
  15 +import java.time.LocalDateTime;
  16 +import java.time.temporal.ChronoUnit;
12 17 import java.util.List;
13 18 import java.util.Map;
14 19  
... ... @@ -32,10 +37,37 @@ public interface MemberSignInRecordConvert {
32 37 memberUserRespDTO -> record.setNickname(memberUserRespDTO.getNickname())));
33 38 return voPageResult;
34 39 }
  40 +
35 41 PageResult<MemberSignInRecordRespVO> convertPage(PageResult<MemberSignInRecordDO> pageResult);
36 42  
37 43 PageResult<AppMemberSignInRecordRespVO> convertPage02(PageResult<MemberSignInRecordDO> pageResult);
38 44  
39 45 AppMemberSignInRecordRespVO coverRecordToAppRecordVo(MemberSignInRecordDO memberSignInRecordDO);
40 46  
  47 + default MemberSignInRecordDO convert(Long userId, MemberSignInRecordDO firstRecord, List<MemberSignInConfigDO> signInConfigs) {
  48 + // 1. 计算今天是第几天签到
  49 + long day = ChronoUnit.DAYS.between(firstRecord.getCreateTime(), LocalDateTime.now());
  50 + // 2. 初始化签到信息
  51 + MemberSignInRecordDO signInRecord = new MemberSignInRecordDO().setUserId(userId)
  52 + .setDay(Integer.parseInt(Long.toString(day))) // 设置签到天数
  53 + .setPoint(0) // 设置签到积分默认为 0
  54 + .setExperience(0); // 设置签到经验默认为 0
  55 +
  56 +
  57 + // 3. 获取签到对应的积分数
  58 + MemberSignInConfigDO lastConfig = signInConfigs.get(signInConfigs.size() - 1); // 最大签到天数
  59 + if (day > lastConfig.getDay()) { // 超出范围按第一天的经验计算
  60 + signInRecord.setPoint(signInConfigs.get(0).getPoint());
  61 + signInRecord.setExperience(signInConfigs.get(0).getExperience());
  62 + return signInRecord;
  63 + }
  64 + MemberSignInConfigDO signInConfig = CollUtil.findOne(signInConfigs, config -> ObjUtil.equal(config.getDay(), day));
  65 + if (signInConfig == null) {
  66 + return signInRecord;
  67 + }
  68 + signInRecord.setPoint(signInConfig.getPoint());
  69 + signInRecord.setExperience(signInConfig.getExperience());
  70 + return signInRecord;
  71 + }
  72 +
41 73 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
  View file @2f7371b
... ... @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
6 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
8 8 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
  9 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
9 10 import org.apache.ibatis.annotations.Mapper;
10 11  
11 12 import java.util.List;
... ... @@ -35,9 +36,45 @@ public interface MemberSignInRecordMapper extends BaseMapperX&lt;MemberSignInRecord
35 36 }
36 37  
37 38  
38   - //获取用户的签到记录列表信息,根据签到时间倒序
39   - default List<MemberSignInRecordDO> selectListByUserId(Long userId){
40   - return selectList(new LambdaQueryWrapperX <MemberSignInRecordDO>()
  39 + /**
  40 + * 获取用户最近的签到记录信息,根据签到时间倒序
  41 + *
  42 + * @param userId 用户编号
  43 + * @return 签到记录列表
  44 + */
  45 + default MemberSignInRecordDO selectLastRecordByUserIdDesc(Long userId) {
  46 + return selectOne(new QueryWrapper<MemberSignInRecordDO>()
  47 + .eq("user_id", userId)
  48 + .orderByDesc("create_time")
  49 + .last("limit 1"));
  50 + }
  51 +
  52 + /**
  53 + * 获取用户最早的签到记录信息,根据签到时间倒序
  54 + *
  55 + * @param userId 用户编号
  56 + * @return 签到记录列表
  57 + */
  58 + default MemberSignInRecordDO selectLastRecordByUserIdAsc(Long userId) {
  59 + return selectOne(new QueryWrapper<MemberSignInRecordDO>()
  60 + .eq("user_id", userId)
  61 + .orderByAsc("create_time")
  62 + .last("limit 1"));
  63 + }
  64 +
  65 + default Long selectCountByUserId(Long userId) {
  66 + return selectCount(new LambdaQueryWrapperX<MemberSignInRecordDO>()
  67 + .eq(MemberSignInRecordDO::getUserId, userId));
  68 + }
  69 +
  70 + /**
  71 + * 获取用户的签到记录列表信息,根据签到时间倒序
  72 + *
  73 + * @param userId 用户编号
  74 + * @return 签到记录信息
  75 + */
  76 + default List<MemberSignInRecordDO> selectListByUserId(Long userId) {
  77 + return selectList(new LambdaQueryWrapperX<MemberSignInRecordDO>()
41 78 .eq(MemberSignInRecordDO::getUserId, userId)
42 79 .orderByDesc(MemberSignInRecordDO::getCreateTime));
43 80 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @2f7371b
1 1 package cn.iocoder.yudao.module.member.service.signin;
2 2  
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.util.ObjUtil;
3 5 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 6 import cn.iocoder.yudao.framework.common.pojo.PageParam;
5 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  8 +import cn.iocoder.yudao.framework.common.util.date.DateUtils;
6 9 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
7   -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
8 10 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
9 11 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
10 12 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
11 13 import cn.iocoder.yudao.module.member.controller.app.signin.vo.AppMemberSignInSummaryRespVO;
  14 +import cn.iocoder.yudao.module.member.convert.signin.MemberSignInRecordConvert;
12 15 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
13 16 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
14   -import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInConfigMapper;
15 17 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
16   -import cn.iocoder.yudao.module.member.enums.ErrorCodeConstants;
17 18 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
18 19 import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
19 20 import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
... ... @@ -21,17 +22,17 @@ import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
21 22 import org.apache.commons.lang3.StringUtils;
22 23 import org.springframework.stereotype.Service;
23 24 import org.springframework.transaction.annotation.Transactional;
24   -import org.springframework.util.CollectionUtils;
25 25 import org.springframework.validation.annotation.Validated;
26 26  
27 27 import javax.annotation.Resource;
28 28 import java.time.LocalDate;
29   -import java.time.temporal.ChronoUnit;
  29 +import java.util.Comparator;
30 30 import java.util.List;
31 31 import java.util.Set;
32 32  
33 33 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
34 34 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  35 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.SIGN_IN_RECORD_TODAY_EXISTS;
35 36  
36 37 /**
37 38 * 签到记录 Service 实现类
... ... @@ -45,7 +46,7 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
45 46 @Resource
46 47 private MemberSignInRecordMapper signInRecordMapper;
47 48 @Resource
48   - private MemberSignInConfigMapper signInConfigMapper;
  49 + private MemberSignInConfigService signInConfigService;
49 50 @Resource
50 51 private MemberPointRecordService pointRecordService;
51 52 @Resource
... ... @@ -56,49 +57,63 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
56 57  
57 58 @Override
58 59 public AppMemberSignInSummaryRespVO getSignInRecordSummary(Long userId) {
  60 + // 1. 初始化默认返回信息
59 61 AppMemberSignInSummaryRespVO vo = new AppMemberSignInSummaryRespVO();
60 62 vo.setTotalDay(0);
61 63 vo.setContinuousDay(0);
62 64 vo.setTodaySignIn(false);
63   - //获取用户签到的记录，按照天数倒序获取
64   - List<MemberSignInRecordDO> signInRecordDOList = signInRecordMapper.selectListByUserId(userId);
65   - // TODO @xiaqing：if 空的时候，直接 return；这样括号少，逻辑更简洁；
66   - if (!CollectionUtils.isEmpty(signInRecordDOList)) {
67   - //设置总签到天数
68   - vo.setTotalDay(signInRecordDOList.size()); // TODO @xiaqing：是不是不用读取 signInRecordDOList 所有的，而是 count下，然后另外再读取一条最后一条；
69   - //判断当天是否有签到复用校验方法
70   - // TODO @xiaqing：不要用异常实现逻辑；还是判断哈；
71   - try {
72   - validSignDay(signInRecordDOList.get(0));
73   - vo.setTodaySignIn(false);
74   - } catch (Exception e) {
75   - vo.setTodaySignIn(true);
76   - }
77   - //如果当天签到了则说明连续签到天数有意义，否则直接用默认值0
78   - if (vo.getTodaySignIn()) {
79   - //下方计算连续签到从2天开始，此处直接设置一天连续签到
80   - vo.setContinuousDay(1);
81   - //判断连续签到天数
82   - // TODO @xiaqing：这里逻辑，想想怎么在简化下，可读性可以在提升下哈；
83   - for (int i = 1; i < signInRecordDOList.size(); i++) {
84   - //前一天减1等于当前天数则说明连续，继续循环
85   - LocalDate cur = signInRecordDOList.get(i).getCreateTime().toLocalDate();
86   - LocalDate pre = signInRecordDOList.get(i - 1).getCreateTime().toLocalDate();
87   - if (1 == daysBetween(cur, pre)) {
88   - vo.setContinuousDay(i + 1);
89   - } else {
90   - break;
91   - }
92   - }
93   - }
94 65  
  66 + // 2. 获取用户签到的记录数
  67 + Long signCount = signInRecordMapper.selectCountByUserId(userId);
  68 + if (ObjUtil.equal(signCount, 0L)) {
  69 + return vo;
  70 + }
  71 + vo.setTotalDay(signCount.intValue()); // 设置总签到天数
  72 +
  73 + // 3. 校验当天是否有签到
  74 + MemberSignInRecordDO signInRecord = signInRecordMapper.selectLastRecordByUserIdDesc(userId);
  75 + if (signInRecord == null) {
  76 + return vo;
  77 + }
  78 + vo.setTodaySignIn(DateUtils.isToday(signInRecord.getCreateTime()));
95 79  
  80 + // 4. 校验今天是否签到，没有签到则直接返回
  81 + if (!vo.getTodaySignIn()) {
  82 + return vo;
96 83 }
  84 + // 4.1. 判断连续签到天数
  85 + List<MemberSignInRecordDO> signInRecords = signInRecordMapper.selectListByUserId(userId);
  86 + vo.setContinuousDay(calculateConsecutiveDays(signInRecords));
97 87 return vo;
98 88 }
99 89  
100   - private long daysBetween(LocalDate date1, LocalDate date2) {
101   - return ChronoUnit.DAYS.between(date1, date2);
  90 + /**
  91 + * 计算连续签到天数
  92 + *
  93 + * @param signInRecords 签到记录列表
  94 + * @return int 连续签到天数
  95 + */
  96 + public int calculateConsecutiveDays(List<MemberSignInRecordDO> signInRecords) {
  97 + int consecutiveDays = 1; // 初始连续天数为1
  98 + LocalDate previousDate = null;
  99 +
  100 + for (MemberSignInRecordDO record : signInRecords) {
  101 + LocalDate currentDate = record.getCreateTime().toLocalDate();
  102 +
  103 + if (previousDate != null) {
  104 + // 检查相邻两个日期是否连续
  105 + if (currentDate.minusDays(1).isEqual(previousDate)) {
  106 + consecutiveDays++;
  107 + } else {
  108 + // 如果日期不连续，停止遍历
  109 + break;
  110 + }
  111 + }
  112 +
  113 + previousDate = currentDate;
  114 + }
  115 +
  116 + return consecutiveDays;
102 117 }
103 118  
104 119 @Override
... ... @@ -108,7 +123,7 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
108 123 if (StringUtils.isNotBlank(pageReqVO.getNickname())) {
109 124 List<MemberUserRespDTO> users = memberUserApi.getUserListByNickname(pageReqVO.getNickname());
110 125 // 如果查询用户结果为空直接返回无需继续查询
111   - if (CollectionUtils.isEmpty(users)) {
  126 + if (CollUtil.isEmpty(users)) {
112 127 return PageResult.empty();
113 128 }
114 129 userIds = convertSet(users, MemberUserRespDTO::getId);
... ... @@ -125,73 +140,40 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
125 140 @Override
126 141 @Transactional(rollbackFor = Exception.class)
127 142 public MemberSignInRecordDO createSignRecord(Long userId) {
128   - // 获取当前用户签到的最大天数
129   - // TODO @xiaqing：db 操作，dou封装到 mapper 中；
130   - // TODO @xiaqing：maxSignDay，是不是变量叫 lastRecord 会更容易理解哈；
131   - MemberSignInRecordDO maxSignDay = signInRecordMapper.selectOne(new LambdaQueryWrapperX<MemberSignInRecordDO>()
132   - .eq(MemberSignInRecordDO::getUserId, userId)
133   - .orderByDesc(MemberSignInRecordDO::getDay)
134   - .last("limit 1"));
135   - // 判断是否重复签到
136   - validSignDay(maxSignDay);
137   -
138   - // 1. 查询出当前签到的天数
139   - MemberSignInRecordDO sign = new MemberSignInRecordDO().setUserId(userId); // TODO @xiaqing：应该使用 record 变量，会更合适
140   - sign.setDay(1); // 设置签到初始化天数
141   - sign.setPoint(0); // 设置签到积分默认为 0
142   - sign.setExperience(0); // 设置签到经验默认为 0
143   - // 如果不为空则修改当前签到对应的天数
144   - // TODO @xiaqing：应该是要判断连续哈，就是昨天；
145   - if (maxSignDay != null) {
146   - sign.setDay(maxSignDay.getDay() + 1);
147   - }
148   - // 2. 获取签到对应的积分数
149   - // 获取所有的签到规则，按照天数排序，只获取启用的 TODO @xiaqing：不要使用 signInConfigMapper 直接查询，而是要通过 SigninConfigService；
150   - List<MemberSignInConfigDO> configDOList = signInConfigMapper.selectList(new LambdaQueryWrapperX<MemberSignInConfigDO>()
151   - .eq(MemberSignInConfigDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
152   - .orderByAsc(MemberSignInConfigDO::getDay));
153   - // 如果签到的天数大于最大启用的规则天数，直接给最大签到的积分数
154   - // TODO @xiaqing：超过最大配置的天数，应该直接重置到第一天哈；
155   - MemberSignInConfigDO lastConfig = configDOList.get(configDOList.size() - 1);
156   - if (sign.getDay() > lastConfig.getDay()) {
157   - sign.setPoint(lastConfig.getPoint());
158   - sign.setExperience(lastConfig.getExperience());
159   - } else {
160   - configDOList.forEach(el -> {
161   - // 循环匹配对应天数，设置对应积分数
162   - // TODO @xiaqing：使用 equals；另外，这种不应该去遍历比较，从可读性来说，应该 CollUtil.findOne()
163   - if (el.getDay() == sign.getDay()) {
164   - sign.setPoint(el.getPoint());
165   - sign.setExperience(el.getExperience());
166   - }
167   -
168   - });
169   - }
  143 + // 1. 获取当前用户最近的签到
  144 + MemberSignInRecordDO lastRecord = signInRecordMapper.selectLastRecordByUserIdDesc(userId);
  145 + // 1.1. 判断是否重复签到
  146 + validateSigned(lastRecord);
  147 +
  148 + // 2. 获取当前用户最早的一次前端记录，用于计算今天是第几天签到
  149 + MemberSignInRecordDO firstRecord = signInRecordMapper.selectLastRecordByUserIdAsc(userId);
  150 + // 2.1. 获取所有的签到规则
  151 + List<MemberSignInConfigDO> signInConfigs = signInConfigService.getSignInConfigList(CommonStatusEnum.ENABLE.getStatus());
  152 + signInConfigs.sort(Comparator.comparing(MemberSignInConfigDO::getDay));
  153 + // 2.2. 组合数据
  154 + MemberSignInRecordDO record = MemberSignInRecordConvert.INSTANCE.convert(userId, firstRecord, signInConfigs);
170 155  
171 156 // 3. 插入签到记录
172   - signInRecordMapper.insert(sign);
  157 + signInRecordMapper.insert(record);
173 158  
174 159 // 4. 增加积分
175   - if (!ObjectUtils.equalsAny(sign.getPoint(), null, 0)) {
176   - pointRecordService.createPointRecord(userId, sign.getPoint(), MemberPointBizTypeEnum.SIGN, String.valueOf(sign.getId()));
  160 + if (!ObjectUtils.equalsAny(record.getPoint(), null, 0)) {
  161 + pointRecordService.createPointRecord(userId, record.getPoint(), MemberPointBizTypeEnum.SIGN, String.valueOf(record.getId()));
177 162 }
178 163 // 5. 增加经验
179   - if (!ObjectUtils.equalsAny(sign.getPoint(), null, 0)) {
180   - memberLevelService.addExperience(userId, sign.getExperience(), MemberExperienceBizTypeEnum.SIGN_IN, String.valueOf(sign.getId()));
  164 + if (!ObjectUtils.equalsAny(record.getExperience(), null, 0)) {
  165 + memberLevelService.addExperience(userId, record.getExperience(), MemberExperienceBizTypeEnum.SIGN_IN, String.valueOf(record.getId()));
181 166 }
182 167  
183   - return sign;
  168 + return record;
184 169 }
185 170  
186   - // TODO @xiaqing：校验使用 validate 动词哈；可以改成 validateSigned
187   - private void validSignDay(MemberSignInRecordDO signInRecordDO) {
188   - // TODO @xiaqing：代码格式：if () {} 要有括号哈
189   - if (signInRecordDO == null)
  171 + private void validateSigned(MemberSignInRecordDO signInRecordDO) {
  172 + if (signInRecordDO == null) {
190 173 return;
191   - // TODO @xiaqing：可以直接使用 DateUtils.isToday()
192   - LocalDate today = LocalDate.now();
193   - if (today.equals(signInRecordDO.getCreateTime().toLocalDate())) {
194   - throw exception(ErrorCodeConstants.SIGN_IN_RECORD_TODAY_EXISTS);
  174 + }
  175 + if (DateUtils.isToday(signInRecordDO.getCreateTime())) {
  176 + throw exception(SIGN_IN_RECORD_TODAY_EXISTS);
195 177 }
196 178 }
197 179  
... ...