From eeb3a08a0571b99c7855c7c1d25cb8cc239bb6d0 Mon Sep 17 00:00:00 2001
From: nili <nili@baicizhan.com>
Date: Tue, 19 Mar 2024 17:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=97=A5=E6=9C=9F=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../awesome/group/game/service/AdminService.java | 16 +++++++++++++++-
 .../group/game/service/bo/AdvRecordQuery.java    |  3 +++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/game-service/src/main/java/awesome/group/game/service/AdminService.java b/game-service/src/main/java/awesome/group/game/service/AdminService.java
index 3830f98..7a61b25 100644
--- a/game-service/src/main/java/awesome/group/game/service/AdminService.java
+++ b/game-service/src/main/java/awesome/group/game/service/AdminService.java
@@ -15,15 +15,19 @@ import awesome.group.game.service.common.exception.PaganiExceptionCode;
 import awesome.group.game.service.util.EncryptUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -68,6 +72,16 @@ public class AdminService {
         if (StringUtils.hasText(param.deviceId)) {
             wrapper.eq(MatrixAdvRecord::getDeviceId, param.deviceId);
         }
+        if (!CollectionUtils.isEmpty(param.createdAt)) {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                Date begin = format.parse(param.createdAt.get(0)), end = format.parse(param.createdAt.get(1));
+                wrapper.between(MatrixAdvRecord::getCreatedAt, new Timestamp(begin.getTime()), new Timestamp(end.getTime()));
+            } catch (ParseException e) {
+                throw new PaganiException(PaganiExceptionCode.ILLEGAL_REQUEST, "时间范围有误");
+            }
+
+        }
         wrapper.orderByDesc(MatrixAdvRecord::getId);
         if (ownerId != 1) {
             List<Integer> appIds = appList.stream().filter(x -> x.getOwnerId() != null && x.getOwnerId() == ownerId).map(MatrixApp::getId).toList();
diff --git a/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java b/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java
index 4c3846d..7f538f6 100644
--- a/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java
+++ b/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java
@@ -1,7 +1,10 @@
 package awesome.group.game.service.bo;
 
+import java.util.List;
+
 public class AdvRecordQuery extends PageParam {
     public Integer advType = 3;//默认展示激励视频
     public Integer platform;
     public String deviceId;
+    public List<String> createdAt;
 }