From 1b8abd22defa5c8350ed8ead2627c1591f03ee1b Mon Sep 17 00:00:00 2001
From: nili <nili@baicizhan.com>
Date: Sun, 28 Apr 2024 13:03:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=95=B0=E6=8D=AE=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/game/service/AdminService.java      | 21 ++++++++++++-------
 .../game/service/bo/AddMockScheduleReq.java   |  4 +++-
 2 files changed, 16 insertions(+), 9 deletions(-)

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 7e86420..586138e 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
@@ -120,7 +120,7 @@ public class AdminService {
         int page = param.current;
         int pageSize = param.pageSize;
         PageResult<MatrixAdvRecordBo> res = new PageResult<>();
-        if (page == 1 && StringUtils.hasText(param.deviceId)) {
+        if (page == 1) {
             QueryWrapper<MatrixAdvRecord> sumQuery = wrapper.clone();
             sumQuery.select("sum(ecpm) as ecpm");
             MatrixAdvRecord sum = advRecordMapper.selectOne(sumQuery);
@@ -265,7 +265,9 @@ public class AdminService {
     }
 
     public List<MatrixMockSchedule> mockScheduleList() {
-        return mockScheduleMapper.selectList(null);
+        List<MatrixMockSchedule> data = mockScheduleMapper.selectList(new QueryWrapper<MatrixMockSchedule>().last("limit 200"));
+        Collections.reverse(data);
+        return data;
     }
 
     public void addMockSchedule(AddMockScheduleReq bo) {
@@ -273,12 +275,15 @@ public class AdminService {
         if (app == null || !StringUtils.hasText(app.getChannel())) {
             throw new PaganiException(PaganiExceptionCode.ILLEGAL_REQUEST, "应用不存在或渠道为空");
         }
-        MatrixMockSchedule schedule = new MatrixMockSchedule();
-        schedule.setAppId(bo.appId);
-        schedule.setScheduleTime(new Timestamp(bo.scheduleTime));
-        schedule.setChannel(app.getChannel());
-        schedule.setIncomeYuan(bo.incomeYuan);
-        mockScheduleMapper.insert(schedule);
+        bo.scheduleTime.forEach(x -> {
+            MatrixMockSchedule schedule = new MatrixMockSchedule();
+            schedule.setAppId(bo.appId);
+            schedule.setScheduleTime(new Timestamp(x));
+            schedule.setChannel(app.getChannel());
+            schedule.setIncomeYuan(bo.incomeYuan);
+            mockScheduleMapper.insert(schedule);
+        });
+
     }
 
     public OverviewBo incomeOverview(int adminId, String code) {
diff --git a/game-service/src/main/java/awesome/group/game/service/bo/AddMockScheduleReq.java b/game-service/src/main/java/awesome/group/game/service/bo/AddMockScheduleReq.java
index 3871990..ed1cd20 100644
--- a/game-service/src/main/java/awesome/group/game/service/bo/AddMockScheduleReq.java
+++ b/game-service/src/main/java/awesome/group/game/service/bo/AddMockScheduleReq.java
@@ -1,7 +1,9 @@
 package awesome.group.game.service.bo;
 
+import java.util.List;
+
 public class AddMockScheduleReq {
     public Integer appId;
     public Integer incomeYuan;
-    public long scheduleTime;//毫秒
+    public List<Long> scheduleTime;//毫秒
 }