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