创建默认签到任务

ch-core/src/main/java/com/wwdz/ch/core/consts/CommConsts.java

@@ -231,4 +231,12 @@ public interface CommConsts {
 	 * 乾岛的token前缀标识，用于拦截器的特殊处理
 	 */
 	public static final String QIANDAO_PRE_TOKEN = "qiandao_";
+
+	/**
+	 * 当用户不选择任务签到时，默认任务id为0
+	 */
+	public static final Long DEFAULT_TASK_ID = 0L;
 }
+
+
+

ch-core/src/main/java/com/wwdz/ch/core/consts/qiandao/SignInTaskEnum.java

@@ -50,6 +50,7 @@ public class SignInTaskEnum {
     public enum TypeEnum {
         CONTINUOUS(1, "连续签到任务"),
         ACCUMULATE(2, "累计签到任务"),
+        DEFAULT(3, "默认任务"),
 
         ;
 

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

@@ -37,6 +37,8 @@ public class SignInTaskDaoImpl implements SignInTaskDao {
         JdbcHelper.ifPresent(dto.getType(), criteria :: andTypeEqualTo);
         JdbcHelper.ifPresent(dto.getState(), criteria :: andStateEqualTo);
         JdbcHelper.ifPresent(dto.getStateList(), criteria :: andStateIn);
+        //默认任务过滤掉
+        criteria.andTypeNotEqualTo(3);
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         example.setOrderByClause("create_time desc");
         return signInTaskMapper.selectByExample(example);

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

@@ -54,7 +54,7 @@ public class QdUserSignInServiceImpl implements QdUserSignInService {
         try {
             Date now = new Date();
             long userId = dto.getUserId();
-            long taskId = dto.getTaskId();
+            Long taskId = dto.getTaskId() == null ? CommConsts.DEFAULT_TASK_ID : dto.getTaskId();
             SignInTask signInTask = signInTaskDao.findById(taskId);
             //签到目标天数
             int goalDays = signInTask.getGoalDays();
@@ -123,7 +123,7 @@ public class QdUserSignInServiceImpl implements QdUserSignInService {
     public Result getReward(QdUserSignInRequestDto dto) {
         try {
             long userId = dto.getUserId();
-            long taskId = dto.getTaskId();
+            Long taskId = dto.getTaskId() == null ? CommConsts.DEFAULT_TASK_ID : dto.getTaskId();
             //查询签到记录
             QdUserSignIn qdUserSignIn = qdUserSignInDao.findRecord(dto.getUserId(), dto.getSignInDate(), null, taskId);
             if (qdUserSignIn == null) {
@@ -191,7 +191,7 @@ public class QdUserSignInServiceImpl implements QdUserSignInService {
     public Result findInfo(QdUserSignInRequestDto dto) {
         try {
             Map<String, Object> map = new HashMap<>();
-            long taskId = dto.getTaskId();
+            Long taskId = dto.getTaskId() == null ? CommConsts.DEFAULT_TASK_ID : dto.getTaskId();
             QdUserSignIn qdUserSignIn = qdUserSignInDao.findLastedRecord(dto.getUserId(), taskId);
             if (qdUserSignIn != null) {
                 LocalDate today = LocalDate.now();