签到4

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/SignInRewardVo.java

 package com.wwdz.ch.wx.entity.vo;
 
+
+import lombok.Data;
+
 /**
  * 签到奖励
  */
+@Data
 public class SignInRewardVo {
+
+    /**
+     * 奖励等级
+     */
+    private Integer rewardLevel;
+
+    /**
+     * 签到日期
+     */
+    private String signDate;
+
+    /**
+     * 是否领取
+     */
+    private Boolean isGet;
+
+    /**
+     * 对应奖励的签到天数
+     */
+    private Integer dayNum;
 }

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

@@ -12,6 +12,7 @@ import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
 import com.wwdz.ch.db.domain.UserSignIn;
 import com.wwdz.ch.db.domain.distribution.DistributionOrder;
 import com.wwdz.ch.db.dto.request.UserSignInRequestDto;
+import com.wwdz.ch.wx.entity.vo.SignInRewardVo;
 import com.wwdz.ch.wx.service.UserSigninService;
 import com.xxdxxs.utils.DateUtils;
 import com.xxdxxs.utils.StringUtils;
@@ -196,6 +197,7 @@ public class UserSigninServiceImpl implements UserSigninService {
             //每个月一号是周几
             resultMap.put("firstDayOfWeek", DateTimeUtil.getFirstDayOfMonth(year, month));
 
+            List<SignInRewardVo> signInRewardVos = new ArrayList<>();
             //该月份所有的日期
             List<String> dateList = DateTimeUtil.getMonthDates(dto.getYearMonth());
             Date startTime = DateTimeUtil.getDateWithMinTime(dateList.get(0));
@@ -234,6 +236,7 @@ public class UserSigninServiceImpl implements UserSigninService {
                         }
                     }
                 }
+
                 //签到记录里包含该日期则表示已签到
                 if (signDateList.contains(dateStr)) {
                     signDateRecord.setIsSignIn(true);
@@ -242,9 +245,26 @@ public class UserSigninServiceImpl implements UserSigninService {
                     signDateRecord.setRewardLevel(signDateMap.get(dateStr).getRewardLevel());
                     signDateRecord.setConsecutiveDays(signDateMap.get(dateStr).getConsecutiveDays());
                     if (signDateMap.get(dateStr).getConsecutiveDays() == 7) {
-                        resultMap.put("level1", signDateMap.get(dateStr).getIsGet());
-                    } else {
-
+                        SignInRewardVo signInRewardVo = new SignInRewardVo();
+                        signInRewardVo.setDayNum(7);
+                        signInRewardVo.setSignDate(signDateMap.get(dateStr).getSignInDate());
+                        signInRewardVo.setIsGet(signDateMap.get(dateStr).getIsGet());
+                        signInRewardVo.setRewardLevel(SigninEnum.LevelEnum.FIRST.getCode());
+                        signInRewardVos.add(signInRewardVo);
+                    } else if (signDateMap.get(dateStr).getConsecutiveDays() == 14) {
+                        SignInRewardVo signInRewardVo = new SignInRewardVo();
+                        signInRewardVo.setDayNum(14);
+                        signInRewardVo.setSignDate(signDateMap.get(dateStr).getSignInDate());
+                        signInRewardVo.setIsGet(signDateMap.get(dateStr).getIsGet());
+                        signInRewardVo.setRewardLevel(SigninEnum.LevelEnum.SECOND.getCode());
+                        signInRewardVos.add(signInRewardVo);
+                    } else if (signDateMap.get(dateStr).getConsecutiveDays() == 21) {
+                        SignInRewardVo signInRewardVo = new SignInRewardVo();
+                        signInRewardVo.setDayNum(21);
+                        signInRewardVo.setSignDate(signDateMap.get(dateStr).getSignInDate());
+                        signInRewardVo.setIsGet(signDateMap.get(dateStr).getIsGet());
+                        signInRewardVo.setRewardLevel(SigninEnum.LevelEnum.THIRD.getCode());
+                        signInRewardVos.add(signInRewardVo);
                     }
                 } else {
                     signDateRecord.setIsSignIn(false);
@@ -255,6 +275,8 @@ public class UserSigninServiceImpl implements UserSigninService {
                 }
                 calendar.add(signDateRecord);
             }
+            //页面上显示的签到奖励是否领取
+            resultMap.put("signInRewardVos", signInRewardVos);
             //日历数据
             resultMap.put("calendar", calendar);
             //签到进度