打卡动态

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

@@ -37,6 +37,11 @@ public class QdSignInNoteVo implements Entity {
      */
     private Long taskId;
 
+    /**
+     * 任务名称
+     */
+    private String taskName;
+
     /**
      * 标题
      */

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

@@ -108,7 +108,7 @@ public class SignInTaskVo implements Entity {
     /**
      * 累计签到天数
      */
-    private Integer totalDays;
+    private Long totalDays;
 
     /**
      * 领取奖励的标准

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

@@ -92,6 +92,18 @@ public class QdSignInTaskServiceImpl implements QdSignInTaskService {
                 signInTaskVo.setSignInTime(timeRange);
             }
             QdUserSignIn qdUserSignIn = qdUserSignInDao.findLastedRecord(dto.getUserId(), taskId);
+            signInTaskVo.setConsecutiveDays(qdUserSignIn.getConsecutiveDays());
+            //查询累计签到天数
+            long totalDays = qdUserSignInDao.countTotalRecord(dto.getUserId(), taskId);
+            signInTaskVo.setTotalDays(totalDays);
+            String goalStr = "";
+            if (SignInTaskEnum.TypeEnum.CONTINUOUS.getCode() == signInTask.getType()) {
+                goalStr = "连续签到" + signInTask.getGoalDays() + "天可领取奖品";
+            } else {
+                goalStr = "累计签到" + signInTask.getGoalDays() + "天可领取奖品";
+            }
+            signInTaskVo.setGoalDesc(goalStr);
+            //查询打卡动态
 
 
             return Result.success();

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

@@ -6,6 +6,7 @@ import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.qiandao.*;
 import com.wwdz.ch.db.domain.qiandao.QdUser;
 import com.wwdz.ch.db.domain.qiandao.QdUserSignInNote;
+import com.wwdz.ch.db.domain.qiandao.SignInTask;
 import com.wwdz.ch.db.dto.request.qiandao.QdUserSignInNoteRequestDto;
 import com.wwdz.ch.wx.entity.vo.qiandao.QdSignInNoteVo;
 import com.wwdz.ch.wx.service.qiandao.QdUserSignInNoteService;
@@ -69,6 +70,8 @@ public class QdUserSignInNoteServiceImpl implements QdUserSignInNoteService {
                     uploadTime = "1小时内发布";
                 }
                 qdSignInNoteVo.setUploadTime(uploadTime);
+                SignInTask signInTask = signInTaskDao.findById(qdUserSignInNote.getTaskId());
+                qdSignInNoteVo.setTaskName(signInTask.getName());
                 list.add(qdSignInNoteVo);
             }
             return Result.success(PageSearchResult.of(pageInfo, list));