From 28a07b5b768096a2c75b55c440b8afd0b50b3f0b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 16:55:35 +0800
Subject: [PATCH] a

---
 server/platform/src/main/java/com/doumee/task/ScheduleTool.java |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index ef5de1a..3a34d01 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -51,8 +51,7 @@
     /**
      * @throws Exception
      */
-//    @Scheduled(cron = "0 0 11 * * ? ")
-    public void syncStudent() throws Exception {
+    public void getWxBill() throws Exception {
         //鍓嶄竴澶╃殑鏁告摎
         Date ydate = DateUtil.addDaysToDate(new Date(), -1);
         wxBillService.getWxBill(ydate);
@@ -75,17 +74,11 @@
      * 30 绉掑埛鏂颁竴娆�
      * @throws Exception
      */
-//    @Scheduled(cron = "0/30 * * * * ? ")
+    @Scheduled(cron = "0/30 * * * * ? ")
     public void autoRefreshLockStatus() throws Exception {
-<<<<<<< HEAD
-        log.info("=====================寮�濮嬪埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
-        memberRidesService.autoRefreshLockStatus();
-        log.info("=====================寮�濮嬪埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
-=======
         log.info("=====================寮�濮嬪畾鏃跺埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
         memberRidesService.autoRefreshLockStatus();
         log.info("=====================缁撴潫瀹氭椂鍒锋柊楠戣涓殑鏁板厖鍊兼湭寮�閿佸け璐�=======================");
->>>>>>> 50c564c2568e7fb52d8dcbcbebb937a6a8284eeb
     }
 
 
@@ -93,11 +86,7 @@
      * 绔欑偣杞﹁締婊℃灦鐜囬璀�
      * @throws Exception
      */
-<<<<<<< HEAD
     @Scheduled(fixedDelay = 1000L * 60L * 10L)
-=======
-//    @Scheduled(fixedDelay = 1000L * 60L * 3L)
->>>>>>> 50c564c2568e7fb52d8dcbcbebb937a6a8284eeb
     public void siteReserves() throws Exception {
         log.info("=====================寮�濮� 绔欑偣杞﹁締婊℃灦鐜囬璀�=======================");
         sitesService.siteReservesNotice();;

--
Gitblit v1.9.3