查询签到信息2

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/qiandao/SignInTaskRequestDto.java

@@ -12,6 +12,7 @@ public class SignInTaskRequestDto extends BaseRequestDto implements Entity {
 
     private Long id;
 
+
     private Long userId;
 
     /**

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
@@ -113,7 +114,21 @@ public class QdSignInTaskServiceImpl implements QdSignInTaskService {
                 signInTaskVo.setSignInTime(timeRange);
             }
             QdUserSignIn qdUserSignIn = qdUserSignInDao.findLastedRecord(dto.getUserId(), taskId);
+            if (qdUserSignIn != null) {
+                signInTaskVo.setIsJoin(true);
+                LocalDate today = LocalDate.now();
+                LocalDate yesterday = today.minusDays(1);
+                DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                String yesterdayString = yesterday.format(dateFormatter);
+                String todayStr = today.format(dateFormatter);
+                if (qdUserSignIn.getSignInDate().equals(yesterdayString) || qdUserSignIn.getSignInDate().equals(todayStr)) {
                     signInTaskVo.setConsecutiveDays(qdUserSignIn.getConsecutiveDays());
+                } else {
+                    signInTaskVo.setConsecutiveDays(0);
+                }
+            } else {
+                signInTaskVo.setConsecutiveDays(0);
+            }
             //查询累计签到天数
             long totalDays = qdUserSignInDao.countTotalRecord(dto.getUserId(), taskId);
             signInTaskVo.setTotalDays(totalDays);
@@ -123,11 +138,10 @@ public class QdSignInTaskServiceImpl implements QdSignInTaskService {
             } else {
                 goalStr = "累计签到" + signInTask.getGoalDays() + "天可领取奖品";
             }
+            long joinPeopleNum = qdUserSignInTaskDao.countByTaskId(taskId);
+            signInTaskVo.setJoinPeopleNum(joinPeopleNum);
             signInTaskVo.setGoalDesc(goalStr);
-            //查询打卡动态
-
-
-            return Result.success();
+            return Result.success(signInTaskVo);
         } catch (Exception e) {
             logger.error("查询签到任务详情 error:{}", e);
         }

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

@@ -64,7 +64,7 @@ public class QdSignInTaskController {
         logger.info("【请求开始】查询签到任务详情,请求参数:{}", JSON.toJSONString(dto));
         Validator validator = new Validator(FormHandler.ofEntity(dto));
         validator.set("userId", "用户id").must().number()
-                .set("taskId", "任务id").must().number()
+                .set("id", "任务id").must().number()
                 .end();
         if (!validator.isValid()) {
             return Result.failed(ResultCode.PARAM_ERROR);