【feat】【第二版开发】

1.修改任务返回给前端的信息

1.技术文档完善功能开发进度
2.刮刮乐记录查询完善查询逻辑

doc/技术文档.md

@@ -62,7 +62,7 @@ ui设计工具：即时设计
 
   4. （已开发）打卡
 
-  5. （已开发，待自测）补打卡
+  5. （已开发）补打卡
 
      对于不同的打卡类型，都是默认直接完成打卡
 
@@ -126,7 +126,7 @@ ui设计工具：即时设计
 
 * 结算
 
-  1. （已完成，待自测）手动运维接口，可以指定具体结算日期
+  1. （已完成）手动运维接口，可以指定具体结算日期
   2. （已完成）按时间范围查询当前用户的结算记录
 
 * 系统

src/main/java/com/punchsettle/server/atomic/service/impl/LotteryScratchRecordServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Objects;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.punchsettle.server.atomic.entity.LotteryScratchRecord;
@@ -61,6 +62,9 @@ public class LotteryScratchRecordServiceImpl implements ILotteryScratchRecordSer
         if (!Objects.isNull(query.getUserId())) {
             criteria.andEqualTo(LotteryScratchRecord::getCreatedBy, query.getUserId());
         }
+        if (!CollectionUtils.isEmpty(query.getActionTypeList())) {
+            criteria.andIn(LotteryScratchRecord::getActionType, query.getActionTypeList());
+        }
         weekend.orderBy(LotteryScratchRecord::getCreationTime).desc();
         return scratchRecordMapper.selectByExample(weekend);
     }

src/main/java/com/punchsettle/server/pojo/scratch/ScratchQuery.java

@@ -6,6 +6,8 @@ import com.punchsettle.server.constant.ScratchActionTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * @author tyuio
  * @version 1.0.0
@@ -20,7 +22,7 @@ public class ScratchQuery extends BaseQuery {
      * 动作类型(0-投入/购买，1-中奖，2-撤销投入，3-撤销中奖)
      * @see ScratchActionTypeEnum
      */
-    private ScratchActionTypeEnum actionType;
+    private List<ScratchActionTypeEnum> actionTypeList;
 
     /**
      * 用户主键

src/main/java/com/punchsettle/server/service/manager/impl/ScratchManagerImpl.java

@@ -1,6 +1,7 @@
 package com.punchsettle.server.service.manager.impl;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -113,6 +114,7 @@ public class ScratchManagerImpl implements IScratchManager {
         Long currentUserId = UserUtils.getCurrentUserId();
         User user = Optional.ofNullable(userService.getById(currentUserId)).orElseThrow(() -> BusinessException.fail("无法获取当前用户信息"));
         query.setUserId(user.getId());
+        query.setActionTypeList(Arrays.asList(ScratchActionTypeEnum.INVEST, ScratchActionTypeEnum.WIN));
 
         List<LotteryScratchRecord> scratchRecords = scratchRecordService.listByCondition(query);
         if (CollectionUtils.isEmpty(scratchRecords)) {