查询签到信息

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserSigninServiceImpl.java

@@ -270,8 +270,6 @@ public class UserSigninServiceImpl implements UserSigninService {
                     signDateRecord.setDateState(SigninEnum.DateStateEnum.FUTURE.getCode());
                 }
 
-
-
                 //签到记录里包含该日期则表示已签到
                 if (signDateList.contains(dateStr)) {
                     signDateRecord.setIsSignIn(true);
@@ -331,20 +329,36 @@ public class UserSigninServiceImpl implements UserSigninService {
                     signDateRecord.setIsGet(false);
                     signDateRecord.setRewardLevel(SigninEnum.LevelEnum.ZERO.getCode());
                     signDateRecord.setConsecutiveDays(0);
-
+                    DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                     //预测签到奖励的时间
                     if (yesterdaySignIn == null) {
                         //昨天没签到就以今天的时间预测之后的奖励日期
-                        if (today.plusDays(6).format(formatter).equals(dateStr) || today.plusDays(13).format(formatter).equals(dateStr)
-                                || today.plusDays(20).format(formatter).equals(dateStr)) {
+                        if (today.plusDays(6).format(dateTimeFormatter).equals(dateStr)) {
+                            signDateRecord.setRewardLevel(SigninEnum.LevelEnum.FIRST.getCode());
+                            signDateRecord.setIsReward(true);
+                            signDateRecord.setIsGet(false);
+                        } else if (today.plusDays(13).format(dateTimeFormatter).equals(dateStr)) {
+                            signDateRecord.setRewardLevel(SigninEnum.LevelEnum.SECOND.getCode());
+                            signDateRecord.setIsReward(true);
+                            signDateRecord.setIsGet(false);
+                        } else if (today.plusDays(20).format(dateTimeFormatter).equals(dateStr)) {
+                            signDateRecord.setRewardLevel(SigninEnum.LevelEnum.THIRD.getCode());
                             signDateRecord.setIsReward(true);
                             signDateRecord.setIsGet(false);
                         }
                     } else {
                         //如果昨天签到了，就以昨天的时间作为预测会拿到签到奖励的起始时间
-                        int ConsecutiveDays = yesterdaySignIn.getConsecutiveDays();
-                        if (today.plusDays(6 - ConsecutiveDays).format(formatter).equals(dateStr) || today.plusDays(13 - ConsecutiveDays).format(formatter).equals(dateStr)
-                                || today.plusDays(20 - ConsecutiveDays).format(formatter).equals(dateStr)) {
+                        int consecutiveDays = yesterdaySignIn.getConsecutiveDays();
+                        if (today.plusDays(6 - consecutiveDays).format(dateTimeFormatter).equals(dateStr)) {
+                            signDateRecord.setRewardLevel(SigninEnum.LevelEnum.FIRST.getCode());
+                            signDateRecord.setIsReward(true);
+                            signDateRecord.setIsGet(false);
+                        } else if (today.plusDays(13 - consecutiveDays).format(dateTimeFormatter).equals(dateStr)) {
+                            signDateRecord.setRewardLevel(SigninEnum.LevelEnum.SECOND.getCode());
+                            signDateRecord.setIsReward(true);
+                            signDateRecord.setIsGet(false);
+                        } else if (today.plusDays(20 - consecutiveDays).format(dateTimeFormatter).equals(dateStr)) {
+                            signDateRecord.setRewardLevel(SigninEnum.LevelEnum.THIRD.getCode());
                             signDateRecord.setIsReward(true);
                             signDateRecord.setIsGet(false);
                         }