签到

ch-core/src/main/java/com/wwdz/ch/core/entity/SignDateRecord.java

+package com.wwdz.ch.core.entity;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+@Data
+public class SignDateRecord implements Entity {
+
+
+    /**
+     * 日期字符串
+     * 不含月份
+     */
+    private Integer dayStr;
+
+    /**
+     * 签到日期
+     * 2024-11-22
+     */
+    private String signDate;
+
+    /**
+     * 是否达到了奖励的签到天数
+     */
+    private Boolean isReward;
+
+    /**
+     * 奖励
+     */
+    private String rewardImageUrl;
+
+    /**
+     * 连续天数
+     */
+    private Integer consecutiveDays;
+
+    /**
+     * 奖励等级
+     */
+    private Integer rewardLevel;
+
+    /**
+     * 是否领取奖励
+     */
+    private Boolean isGet;
+
+    /**
+     * 是否签到过
+     */
+    private Boolean isSignIn;
+
+    /**
+     * 日期的状态
+     * 0过去，1当前，2未来
+     */
+    private Integer dateState;
+
+
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/UserSigninDao.java

@@ -20,6 +20,8 @@ public interface UserSigninDao {
      */
     UserSignIn findYesterdayRecord(long userId);
 
+    UserSignIn findTodayRecord(long userId);
+
     /**
      * 判断某一日期是否签到过
      * @param userId

ch-dao/src/main/java/com/wwdz/ch/db/impl/UserSigninDaoImpl.java

@@ -54,6 +54,16 @@ public class UserSigninDaoImpl implements UserSigninDao {
         return userSignInMapper.selectOneByExample(example);
     }
 
+    @Override
+    public UserSignIn findTodayRecord(long userId) {
+        LocalDate today = LocalDate.now();
+        String todayString = DateUtils.DATE.format(today);
+        UserSignInExample example = new UserSignInExample();
+        UserSignInExample.Criteria criteria = example.createCriteria();
+        criteria.andUserIdEqualTo(userId);
+        criteria.andSignInDateEqualTo(todayString);
+        return userSignInMapper.selectOneByExample(example);
+    }
 
     @Override
     public boolean isExisted(long userId, String date) {

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

@@ -21,10 +21,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
+
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -39,7 +41,7 @@ public class UserSigninServiceImpl implements UserSigninService {
     DistributionOrderDao distributionOrderDao;
 
     @Override
-    public Result signin(UserSignInRequestDto dto) {
+    public Result signIn(UserSignInRequestDto dto) {
         try {
             long userId = dto.getUserId();
             //检查是否已签到过
@@ -66,8 +68,11 @@ public class UserSigninServiceImpl implements UserSigninService {
                 userSignin.setSignInDate(todayStr);
                 userSignin.setCreateTime(new Date());
                 userSignin.setUpdateTime(new Date());
-                //连续签到天数
-                int consecutiveDays = yesterdaySignin.getConsecutiveDays() + 1;
+                int consecutiveDays = 1;
+                //连续签到天数, 21天清零重新计算
+                if (yesterdaySignin.getConsecutiveDays() != 21) {
+                    consecutiveDays = yesterdaySignin.getConsecutiveDays() + 1;
+                }
                 userSignin.setConsecutiveDays(consecutiveDays);
                 switch (consecutiveDays) {
                     case 7:
@@ -143,6 +148,34 @@ public class UserSigninServiceImpl implements UserSigninService {
     @Override
     public Result findList(UserSignInRequestDto dto) {
         try {
+            long userId = dto.getUserId();
+            Map<String, Object> resultMap = new HashMap<>();
+
+
+            //检查昨天是否打过卡
+            UserSignIn yesterdaySignIn = userSigninDao.findYesterdayRecord(userId);
+            if (yesterdaySignIn == null) {
+                //连续签到天数
+                resultMap.put("consecutiveDays", 0);
+                //还需签到的天数
+                resultMap.put("needConsecutiveDays", 7);
+            } else {
+                //查询今天的打卡记录
+                UserSignIn todayRecord = userSigninDao.findLastedRecord(userId);
+                if (todayRecord != null) {
+                    resultMap.put("consecutiveDays", todayRecord.getConsecutiveDays());
+                } else {
+                    resultMap.put("consecutiveDays", yesterdaySignIn.getConsecutiveDays());
+                }
+                int consecutiveDays = Integer.valueOf(resultMap.get("consecutiveDays").toString());
+                if (yesterdaySignIn.getConsecutiveDays() < 7) {
+                    resultMap.put("needConsecutiveDays", 7 - consecutiveDays);
+                } else if (consecutiveDays >= 7 && consecutiveDays < 14) {
+                    resultMap.put("needConsecutiveDays", 14 - consecutiveDays);
+                } else {
+                    resultMap.put("needConsecutiveDays", 21 - consecutiveDays);
+                }
+            }
             //当前是几号
             LocalDate today = LocalDate.now();
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
@@ -155,8 +188,15 @@ public class UserSigninServiceImpl implements UserSigninService {
             if (StringUtils.isEmpty(dto.getYear()) || StringUtils.isEmpty(dto.getMonth())) {
                 dto.setYearMonth(year + "-" + month);
             } else {
+                year = Integer.parseInt(dto.getYear());
+                month = Integer.parseInt(dto.getMonth());
                 dto.setYearMonth(dto.getYear() + "-" + dto.getMonth());
             }
+            resultMap.put("year", year);
+            resultMap.put("month", month);
+            //每个月一号是周几
+            resultMap.put("firstDayOfWeek", DateTimeUtil.getFirstDayOfMonth(year, month));
+
             //该月份所有的日期
             List<String> dateList = DateTimeUtil.getMonthDates(dto.getYearMonth());
             Date startTime = DateTimeUtil.getDateWithMinTime(dateList.get(0));
@@ -165,8 +205,12 @@ public class UserSigninServiceImpl implements UserSigninService {
             dto.setEndQueryTime(endTime);
             List<UserSignIn> userSignInList = userSigninDao.findList(dto);
             List<String> signDateList = userSignInList.stream().map(UserSignIn::getSignInDate).collect(Collectors.toList());
+            Map<String, UserSignIn> signDateMap = userSignInList.stream().collect(Collectors.toMap(UserSignIn::getSignInDate, Function.identity(), (k1, k2) ->k1));
+            List<SignDateRecord> calendar = new ArrayList<>();
             for (String dateStr : dateList) {
                 SignDateRecord signDateRecord = new SignDateRecord();
+                signDateRecord.setDayStr(DateTimeUtil.getDayFromDateString(dateStr));
+                signDateRecord.setSignDate(dateStr);
                 int day = Integer.parseInt(dateStr.replace("-", ""));
                 if (day < currentDay) {
                     signDateRecord.setDateState(SigninEnum.DateStateEnum.PASS.getCode());
@@ -174,14 +218,44 @@ public class UserSigninServiceImpl implements UserSigninService {
                     signDateRecord.setDateState(SigninEnum.DateStateEnum.CURRENT.getCode());
                 } else {
                     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)) {
                     signDateRecord.setIsSignIn(true);
+                    signDateRecord.setIsReward(signDateMap.get(dateStr).getIsReward());
+                    signDateRecord.setIsGet(signDateMap.get(dateStr).getIsGet());
+                    signDateRecord.setRewardLevel(signDateMap.get(dateStr).getRewardLevel());
+                    signDateRecord.setConsecutiveDays(signDateMap.get(dateStr).getConsecutiveDays());
+                } else {
+                    signDateRecord.setIsSignIn(false);
+                    signDateRecord.setIsReward(false);
+                    signDateRecord.setIsGet(false);
+                    signDateRecord.setRewardLevel(SigninEnum.LevelEnum.ZERO.getCode());
+                    signDateRecord.setConsecutiveDays(0);
                 }
+                calendar.add(signDateRecord);
             }
-
-            return Result.success();
+            //日历数据
+            resultMap.put("calendar", calendar);
+            //签到进度
+            resultMap.put("rate", (int)Math.ceil((Double.valueOf(resultMap.get("consecutiveDays").toString()) / 21) * 100));
+            return Result.success(resultMap);
         } catch (Exception e) {
             logger.error("查询签到记录失败 error : {}", e);
         }
@@ -200,11 +274,4 @@ public class UserSigninServiceImpl implements UserSigninService {
 
     }
 
-    public static void main(String[] args) {
-        List<String> dateList = DateTimeUtil.getMonthDates("2024-11");
-        Date startTime = DateTimeUtil.getDateWithMinTime(dateList.get(0));
-        Date endTime = DateTimeUtil.getDateWithMaxTime(dateList.get((dateList.size() - 1)));
-        System.out.println(startTime);
-        System.out.println(endTime);
-    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/UserSigninService.java

@@ -10,7 +10,7 @@ public interface UserSigninService {
      * @param dto
      * @return
      */
-    Result signin(UserSignInRequestDto dto);
+    Result signIn(UserSignInRequestDto dto);
 
     /**
      * 领取奖励

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/UserSigninController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/wx/userSignin")
+@RequestMapping("/wx/userSignIn")
 public class UserSigninController {
 
     private static final Logger logger = LoggerFactory.getLogger(UserSigninController.class);
@@ -26,8 +26,8 @@ public class UserSigninController {
     UserSigninService userSigninService;
 
     @ApiOperation(value = "用户签到")
-    @PostMapping("/checkAbleToOpenShop")
-    public Result checkAbleToOpenShop(@RequestBody UserSignInRequestDto dto) {
+    @PostMapping("/signIn")
+    public Result signIn(@RequestBody UserSignInRequestDto dto) {
         logger.info("【请求开始】用户签到,请求参数:{}", JSON.toJSONString(dto));
         Validator validator = new Validator(FormHandler.ofEntity(dto));
         validator.set("userId", "用户id").must().number()
@@ -35,7 +35,7 @@ public class UserSigninController {
         if (!validator.isValid()) {
             return Result.failed(ResultCode.PARAM_ERROR);
         }
-        return userSigninService.signin(dto);
+        return userSigninService.signIn(dto);
     }