From 544f20b6f77393c5ab08197a0ca77aff453d4ec8 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 29 Aug 2024 17:52:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E6=95=B0=E5=88=A0=E9=99=A4=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infra/controller/admin/ticketing/TicketingController.java | 4 ++++
 .../yudao/module/infra/job/ticketing/TicketDataMigration.java | 3 +++
 .../infra/service/checkticket/CheckTicketServiceImpl.java     | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/ticketing/TicketingController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/ticketing/TicketingController.java
index 773d359f6..e70382b5e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/ticketing/TicketingController.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/ticketing/TicketingController.java
@@ -47,4 +47,8 @@ public class TicketingController {
     public CommonResult<List<String>> testAlla(){
         return CommonResult.success(saleDataService.deleteTwoYearLastMonthAgo());
     }
+    @GetMapping("/testSample")
+    public void testSample(){
+        ticketDataMigration.deleteTwoYearOneMonthAgoAndUpdateLastYearTomorrow();
+    }
 }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/job/ticketing/TicketDataMigration.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/job/ticketing/TicketDataMigration.java
index 343715161..30a5504a7 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/job/ticketing/TicketDataMigration.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/job/ticketing/TicketDataMigration.java
@@ -401,6 +401,9 @@ public class TicketDataMigration {
             int currentDay = startDate.get(Calendar.DAY_OF_MONTH);
             result.add(String.format("抽数服务：%d年%d月%d日：" + methodName + "数据抽数正常结束！总共：%d条数据，%d条数据重复，%d条数据插入成功！", currentYear, currentMonth, currentDay, totalRows, duplicatesCount, successCount));
             XxlJobHelper.log("抽数服务：{}年{}月{}日：{}数据抽数正常结束！总共：{}条数据，{}条数据重复，{}条数据插入成功！", currentYear, currentMonth, currentDay, methodName, totalRows, duplicatesCount, successCount);
+            if (startDate.equals(endDate)){ // 如果日期相等，退出循环
+                break;
+            }
             // 日期递增一天
             startDate.add(Calendar.DAY_OF_MONTH, 1);
         }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/checkticket/CheckTicketServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/checkticket/CheckTicketServiceImpl.java
index 107c4a887..58c81f869 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/checkticket/CheckTicketServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/checkticket/CheckTicketServiceImpl.java
@@ -139,8 +139,8 @@ public class CheckTicketServiceImpl implements CheckTicketService {
         // TODO 使用这种方法删除会报错，暂时使用mongoTemplate进行删除
 //        checkTicketTodayRepository.deleteByCheckticketdateIn(filteredDate);
         Query query = new Query();
-        query.addCriteria(Criteria.where("sddate").in(filteredDate));
-        mongoTemplate.remove(query, "sale_data_today");
+        query.addCriteria(Criteria.where("checkticketdate").in(filteredDate));
+        mongoTemplate.remove(query, "check_ticket_today");
         return filteredDate;
     }