From d8b0e90c5b4d12f0db0d0b7bb186ebd80dc25570 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 17:05:43 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 72c7985..dd63798 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
@@ -52,7 +52,7 @@
// 每天凌晨12点执行的定时任务
-@Scheduled(cron = "0 0 12 1 * ?")
+@Scheduled(cron = "0 0 0 * * ?")
//@Scheduled(fixedRate = 60000)
public void taskMonth() {
try {
@@ -128,7 +128,7 @@
tChargingBill3.setType(2);
tChargingBill3.setSiteId(collect.get(i));
tChargingBill3.setBillTime(LocalDateTime.now());
- tChargingBill3.setBillType(1);
+ tChargingBill3.setBillType(2);
tChargingBill3.setStatus(1);
tChargingBill3.setOrderState(2);
tChargingBills1.add(tChargingBill3);
@@ -143,7 +143,7 @@
}
// 每天晚上23:59:59执行的定时任务
- @Scheduled(cron = "0 0 23 1 * ?")
+ @Scheduled(cron = "0 0 23 * * ?")
public void taskLastDay() {
try {
// 获取上个月的开始和结束日期
--
Gitblit v1.7.1