|
|
@@ -51,6 +51,7 @@ import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import java.util.Optional;
|
|
|
import java.util.concurrent.ThreadLocalRandom;
|
|
|
|
|
|
@Service
|
|
|
@@ -137,8 +138,18 @@ public class MarketFrontServiceImpl implements MarketFrontService {
|
|
|
|
|
|
@Override
|
|
|
public SignUser getUserSignDetail(Long userId) {
|
|
|
- //未签到时,签到
|
|
|
- SignUser signUser = signByUserId(userId);
|
|
|
+ SignUser signUser = signUserMapper.selectOne(Wrappers.lambdaQuery(SignUser.class)
|
|
|
+ .eq(SignUser::getUserId, userId).last("limit 1"));
|
|
|
+ if (signUser == null || signUser.getUpdateTime().before(DateUtil.beginOfDay(DateTime.now()))) {
|
|
|
+ signUser = Optional.ofNullable(signUser).orElseGet(() -> {
|
|
|
+ SignUser user = new SignUser();
|
|
|
+ user.setDay(0);
|
|
|
+ return user;
|
|
|
+ });
|
|
|
+ signUser.setIsHadChecked(false);
|
|
|
+ } else {
|
|
|
+ signUser.setIsHadChecked(true);
|
|
|
+ }
|
|
|
return signUser;
|
|
|
}
|
|
|
|