累计签到

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

@@ -204,14 +204,18 @@ public class UserSigninServiceImpl implements UserSigninService {
                 resultMap.put("consecutiveDays", 0);
                 //还需签到的天数
                 resultMap.put("needConsecutiveDays", 7);
+                resultMap.put("totalConsecutiveDays", 0);
             } else if (yesterdaySignIn == null && todayRecord != null) {
                 resultMap.put("consecutiveDays", todayRecord.getConsecutiveDays());
                 resultMap.put("needConsecutiveDays", 6);
+                resultMap.put("totalConsecutiveDays", todayRecord.getTotalConsecutiveDays());
             } else {
                 if (todayRecord != null) {
                     resultMap.put("consecutiveDays", todayRecord.getConsecutiveDays());
+                    resultMap.put("totalConsecutiveDays", todayRecord.getTotalConsecutiveDays());
                 } else {
                     resultMap.put("consecutiveDays", yesterdaySignIn.getConsecutiveDays());
+                    resultMap.put("totalConsecutiveDays", yesterdaySignIn.getTotalConsecutiveDays());
                 }
                 int consecutiveDays = Integer.valueOf(resultMap.get("consecutiveDays").toString());
                 if (consecutiveDays < 7) {
@@ -224,13 +228,6 @@ public class UserSigninServiceImpl implements UserSigninService {
                     resultMap.put("needConsecutiveDays", 7);
                 }
             }
-            //连续签到天数
-            UserSignIn lastedRecord = userSignInDao.findLastedRecord(userId);
-            if (lastedRecord == null) {
-                resultMap.put("totalConsecutiveDays", 0);
-            } else {
-                resultMap.put("totalConsecutiveDays", lastedRecord.getTotalConsecutiveDays() == null ? 0 : lastedRecord.getTotalConsecutiveDays());
-            }
 
             //当前是几号
             LocalDate today = LocalDate.now();