|
@@ -16,8 +16,8 @@ import shop.alien.entity.store.vo.SignInVo;
|
|
|
import shop.alien.entity.store.vo.UserSignInRecordVo;
|
|
import shop.alien.entity.store.vo.UserSignInRecordVo;
|
|
|
import shop.alien.mapper.ActivityPeriodMapper;
|
|
import shop.alien.mapper.ActivityPeriodMapper;
|
|
|
import shop.alien.mapper.ActivitySignInConfigMapper;
|
|
import shop.alien.mapper.ActivitySignInConfigMapper;
|
|
|
-import shop.alien.mapper.UserSignInRecordMapper;
|
|
|
|
|
import shop.alien.mapper.ActivitySignRewardMapper;
|
|
import shop.alien.mapper.ActivitySignRewardMapper;
|
|
|
|
|
+import shop.alien.mapper.UserSignInRecordMapper;
|
|
|
import shop.alien.mapper.system.SignInActivityMapper;
|
|
import shop.alien.mapper.system.SignInActivityMapper;
|
|
|
import shop.alien.store.service.SignInService;
|
|
import shop.alien.store.service.SignInService;
|
|
|
|
|
|
|
@@ -26,7 +26,6 @@ import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.LocalTime;
|
|
import java.time.LocalTime;
|
|
|
import java.time.ZoneId;
|
|
import java.time.ZoneId;
|
|
|
-import java.time.format.DateTimeFormatter;
|
|
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
@@ -322,7 +321,7 @@ public class SignInServiceImpl extends ServiceImpl<UserSignInRecordMapper, UserS
|
|
|
UserSignInRecord userSignInRecord = userSignInRecordList.get(0);
|
|
UserSignInRecord userSignInRecord = userSignInRecordList.get(0);
|
|
|
Date signInDate = userSignInRecord.getSignInDate();
|
|
Date signInDate = userSignInRecord.getSignInDate();
|
|
|
boolean result = isSameDay(signInDate, dayCount);
|
|
boolean result = isSameDay(signInDate, dayCount);
|
|
|
- if(result){
|
|
|
|
|
|
|
+ if(!result){
|
|
|
return userSignInRecord.getTotalContinuousDays();
|
|
return userSignInRecord.getTotalContinuousDays();
|
|
|
} else{
|
|
} else{
|
|
|
return 0;
|
|
return 0;
|