签到记录需求变更
This commit is contained in:
@@ -79,8 +79,7 @@ public class UserSignRecordServiceImpl extends ServiceImpl<UserSignRecordDao, Us
|
|||||||
dto.setSignDays(signDays);
|
dto.setSignDays(signDays);
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
String beginSignDay = list.stream().findFirst().get().getSignDay();
|
flowDays = buildFlowDays(beginDay.plusDays(-6), activeDays);
|
||||||
flowDays = buildFlowDays(LocalDate.parse(beginSignDay, DateTimeFormatter.ofPattern("yyyy-MM-dd")), activeDays);
|
|
||||||
index = 1;
|
index = 1;
|
||||||
Map<String, Date> signMap = list.stream().collect(Collectors.toMap(UserSignRecord::getSignDay, UserSignRecord::getCreateTime));
|
Map<String, Date> signMap = list.stream().collect(Collectors.toMap(UserSignRecord::getSignDay, UserSignRecord::getCreateTime));
|
||||||
for (String day : flowDays) {
|
for (String day : flowDays) {
|
||||||
@@ -115,11 +114,7 @@ public class UserSignRecordServiceImpl extends ServiceImpl<UserSignRecordDao, Us
|
|||||||
dto.setRecordList(recordList);
|
dto.setRecordList(recordList);
|
||||||
dto.setSignDays(signDays);
|
dto.setSignDays(signDays);
|
||||||
// 该用户是否可以继续签到
|
// 该用户是否可以继续签到
|
||||||
UserSignRecordDTO last = recordList.get(recordList.size() - 1);
|
if (signDays >= 7) {
|
||||||
LocalDate lastDay = LocalDate.parse(last.getSignDay());
|
|
||||||
LocalDate currentDay = LocalDate.now();
|
|
||||||
long daysBetween = ChronoUnit.DAYS.between(currentDay, lastDay);
|
|
||||||
if (daysBetween < 0 || "1".equals(last.getStatus())) {
|
|
||||||
dto.setEnable(0);
|
dto.setEnable(0);
|
||||||
}
|
}
|
||||||
return dto;
|
return dto;
|
||||||
|
|||||||
Reference in New Issue
Block a user