积分优化

renren-admin/src/main/java/io/renren/modules/qmjz/service/ScoreStuService.java

@@ -84,14 +84,6 @@ public interface ScoreStuService extends IService<ScoreStu>{
      */
     Boolean selectSingleTaskComplete(Long stuId, Long id);
 
-    /**
-     * 每日任务是否完成
-     * @param stuId
-     * @param id
-     * @return
-     */
-    Boolean selectDayTaskComplete(Long stuId, Long id);
-
     /**
      * 观看广告
      * @param stuId
@@ -113,5 +105,7 @@ public interface ScoreStuService extends IService<ScoreStu>{
      */
     ScoreStu getOneByStuIdActId(Long stuId, Long actId);
 
+    Integer queryCountDayTask(String day, Long stuId, Long id);
+
     boolean checkScore(TaskManage taskManage, Long stuId, Long queryTaskType);
 }

renren-admin/src/main/java/io/renren/modules/qmjz/service/impl/ScoreStuServiceImpl.java

@@ -180,7 +180,8 @@ public class ScoreStuServiceImpl extends ServiceImpl<ScoreStuMapper, ScoreStu> i
         );
     }
 
-    private Integer queryCountDayTask(String day, Long stuId, Long id) {
+    @Override
+    public Integer queryCountDayTask(String day, Long stuId, Long id) {
         return scoreStuMapper.selectCount(new LambdaQueryWrapper<ScoreStu>()
                 .eq(StringUtils.isNotEmpty(day), ScoreStu::getDay, day)
                 .eq(ScoreStu::getStuId, stuId)
@@ -254,15 +255,6 @@ public class ScoreStuServiceImpl extends ServiceImpl<ScoreStuMapper, ScoreStu> i
                 .last("limit 1")) != null;
     }
 
-    @Override
-    public Boolean selectDayTaskComplete(Long stuId, Long id) {
-        return scoreStuMapper.selectOne(new LambdaQueryWrapper<ScoreStu>()
-                .eq(ScoreStu::getStuId, stuId)
-                .eq(ScoreStu::getTaskId, id)
-                .eq(ScoreStu::getDay, DateForStr.getInfoDateStr())
-                .last("limit 1")) != null;
-    }
-
     @Override
     public R watchAds(Long stuId) {
         if (ObjectUtil.isEmpty(stuId)) {

renren-admin/src/main/java/io/renren/modules/qmjz/service/impl/TaskManageServiceImpl.java

@@ -11,10 +11,12 @@ import io.renren.common.utils.PageUtils;
 import io.renren.common.utils.R;
 import io.renren.modules.qmjz.entity.TaskManage;
 import io.renren.modules.qmjz.entity.bo.TaskManageBo;
+import io.renren.modules.qmjz.enums.TaskMajorType;
 import io.renren.modules.qmjz.mapper.TaskManageMapper;
 import io.renren.modules.qmjz.model.PageQuery;
 import io.renren.modules.qmjz.service.ScoreStuService;
 import io.renren.modules.qmjz.service.TaskManageService;
+import io.renren.modules.qmjz.utils.DateForStr;
 import io.renren.modules.qmjz.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -109,7 +111,7 @@ public class TaskManageServiceImpl extends ServiceImpl<TaskManageMapper, TaskMan
         }
         List<TaskManage> singleTask = taskManageMapper.selectList(new LambdaQueryWrapper<TaskManage>()
                 .eq(TaskManage::getTaskStatus, 1)
-                .eq(TaskManage::getTaskType,0)
+                .eq(TaskManage::getTaskType, TaskMajorType.SINGLE_TASK.getCode())
         );
         for (TaskManage taskManage : singleTask) {
             Boolean complete = scoreStuService.selectSingleTaskComplete(stuId, taskManage.getId());
@@ -117,15 +119,15 @@ public class TaskManageServiceImpl extends ServiceImpl<TaskManageMapper, TaskMan
         }
         List<TaskManage> dayTask = taskManageMapper.selectList(new LambdaQueryWrapper<TaskManage>()
                 .eq(TaskManage::getTaskStatus, 1)
-                .eq(TaskManage::getTaskType,1)
+                .eq(TaskManage::getTaskType,TaskMajorType.DAILY_TASK.getCode())
         );
         for (TaskManage taskManage : dayTask) {
-            Boolean complete = scoreStuService.selectDayTaskComplete(stuId, taskManage.getId());
-            taskManage.setComplete(complete);
+            Integer count = scoreStuService.queryCountDayTask(DateForStr.getInfoDateStr(), stuId, taskManage.getId());
+            taskManage.setComplete(count >= taskManage.getTaskNum());
         }
         List<TaskManage> infiniteTask = taskManageMapper.selectList(new LambdaQueryWrapper<TaskManage>()
                 .eq(TaskManage::getTaskStatus, 1)
-                .eq(TaskManage::getTaskType,2)
+                .eq(TaskManage::getTaskType,TaskMajorType.MULTIPLE_TASK.getCode())
         );
         Map<String, Object> map = new HashMap<>();
         map.put("singleTask",singleTask);