签到分享信息

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

 package com.wwdz.ch.wx.impl;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.consts.DistributionEnum;
 import com.wwdz.ch.core.consts.SigninEnum;
@@ -269,22 +270,7 @@ public class UserSigninServiceImpl implements UserSigninService {
                     signDateRecord.setDateState(SigninEnum.DateStateEnum.FUTURE.getCode());
                 }
 
-                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)) {
-                        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)) {
-                        signDateRecord.setIsReward(true);
-                        signDateRecord.setIsGet(false);
-                    }
-                }
+
 
                 //签到记录里包含该日期则表示已签到
                 if (signDateList.contains(dateStr)) {
@@ -345,6 +331,24 @@ public class UserSigninServiceImpl implements UserSigninService {
                     signDateRecord.setIsGet(false);
                     signDateRecord.setRewardLevel(SigninEnum.LevelEnum.ZERO.getCode());
                     signDateRecord.setConsecutiveDays(0);
+
+                    //预测签到奖励的时间
+                    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)) {
+                            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)) {
+                            signDateRecord.setIsReward(true);
+                            signDateRecord.setIsGet(false);
+                        }
+                    }
                 }
                 calendar.add(signDateRecord);
             }
@@ -373,8 +377,9 @@ public class UserSigninServiceImpl implements UserSigninService {
             String url = "https://quanku.wanwudezhi.com/daily_data";
             OkHttpUtil okHttpUtil = OkHttpUtil.builder().url(url);
             String responseStr = okHttpUtil.get().sync();
-            map.put("suitable", JsonUtils.getValueByPath(responseStr, "yi"));
-            map.put("avoid", JsonUtils.getValueByPath(responseStr, "ji"));
+            ObjectMapper objectMapper = new ObjectMapper();
+            map.put("suitable", objectMapper.readValue(JsonUtils.getValueByPath(responseStr, "yi"), String[].class));
+            map.put("avoid", objectMapper.readValue(JsonUtils.getValueByPath(responseStr, "ji"), String[].class));
             map.put("lunar_date", JsonUtils.getValueByPath(responseStr, "lunar_date"));
             map.put("author", JsonUtils.getValueByPath(responseStr, "quote/author"));
             map.put("text", JsonUtils.getValueByPath(responseStr, "quote/text"));