From b4b44f2021dbf083b7057fb7e192b72d08b4bf17 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 09:23:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
index a79ee1a..b6a4265 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
@@ -44,7 +44,12 @@
         System.err.println(string);
     }
     // 每月2号凌晨12点执行的定时任务
-    @Scheduled(cron = "0 0 0 2 * ?")
+//    @Scheduled(cron = "0 0 0 2 * ?")
+    // 每天凌晨12点执行的定时任务
+
+    @Scheduled(cron = "0 0 12 2 * ?")
+    // 每30秒执行一次的定时任务
+    @Scheduled(cron = "0/30 * * * * ?")
     public void taskMonth() {
         try {
             // 获取上个月的开始和结束日期
@@ -60,7 +65,7 @@
             String randomDigits = random.ints(10, 0, 10) // 生成10个随机数字,范围在0-9
                     .mapToObj(String::valueOf)
                     .collect(Collectors.joining()); // 将其连接成一个字符串
-            tChargingBill.setCode("JSD"+string+randomDigits+"001" );
+            tChargingBill.setCode("JSD"+string+randomDigits );
             tChargingBill.setType(1);
             tChargingBill.setBillTime(LocalDateTime.now());
             tChargingBill.setStatus(1);

--
Gitblit v1.7.1