From d4fbea2ac7f7c98ffd83480f8f2535ca92f3baea Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 29 十一月 2023 18:19:43 +0800
Subject: [PATCH] 11.29

---
 cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java |   45 ++++++++++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java
index 8457a24..4b95453 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java
@@ -25,17 +25,19 @@
     /**
      * 每隔一分钟去处理的定时任务
      */
+    //预约场地后,待支付的订单 时间超过30分钟,不保留
     @Scheduled(fixedRate = 60000)
-    public void taskMinute(){
+    public void taskMinute() {
         try {
-            List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 0));
+            List<SiteBooking> siteBookings = siteBookingMapper.
+                    selectList(new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 0));
             for (SiteBooking siteBooking : siteBookings) {
                 long time = siteBooking.getInsertTime().getTime();
                 long l = time + 1800 * 1000;
-                if(System.currentTimeMillis()>l){
+                if (System.currentTimeMillis() > l) {
                     siteBooking.setStatus(5);
                     siteBookingMapper.updateById(siteBooking);
-
+//                    siteBookingMapper.deleteById(siteBooking.getId());
                 }
             }
             //定时修改赛事状态
@@ -44,20 +46,18 @@
         }
     }
 
-
-
     //预约场地后,时间超过endTime,状态变为已过期
     @Scheduled(fixedRate = 60000)
-    public void taskMinute1(){
+    public void taskMinute1() {
         try {
-            List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 1));
+            List<SiteBooking> siteBookings = siteBookingMapper.selectList
+                    (new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 1));
             for (SiteBooking siteBooking : siteBookings) {
-                    long time = siteBooking.getEndTime().getTime();
-                    if (System.currentTimeMillis() > time) {
-                        siteBooking.setStatus(4);
-                        siteBookingMapper.updateById(siteBooking);
-                    }
-
+                long time = siteBooking.getEndTime().getTime();
+                if (System.currentTimeMillis() > time) {
+                    siteBooking.setStatus(4);
+                    siteBookingMapper.updateById(siteBooking);
+                }
             }
             //定时修改赛事状态
         } catch (Exception e) {
@@ -65,18 +65,17 @@
         }
     }
 
-
+    // 预约场地后,待支付的订单 时间超过30分钟,不保留
     @Scheduled(fixedRate = 60000)
-    public void taskMinute2(){
+    public void taskMinute3() {
         try {
-            List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 0));
+            // 获取待核销状态的记录
+            List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>()
+                    .eq(SiteBooking::getStatus, 1));
             for (SiteBooking siteBooking : siteBookings) {
-                long time = siteBooking.getInsertTime().getTime();
-                long currentTime = System.currentTimeMillis();
-                long timeDifference = currentTime - time;
-                long minutes = TimeUnit.MILLISECONDS.toMinutes(timeDifference);
-                if (minutes > 30) {
-                    siteBooking.setStatus(5);
+                long time = siteBooking.getEndTime().getTime();
+                if (System.currentTimeMillis() > time) {
+                    siteBooking.setStatus(4);
                     siteBookingMapper.updateById(siteBooking);
                 }
             }

--
Gitblit v1.7.1