From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 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 37f8bac..af4ac78 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
@@ -39,21 +39,9 @@
@Resource
private TChargingOrderService chargingOrderService;
- public static void main(String[] args) {
- LocalDate firstDayOfLastMonth = LocalDate.now().minusMonths(1).
- withDayOfMonth(2);
- String string = firstDayOfLastMonth.toString();
- // 将-替换为空字符串
- string = string.replace("-", "");
- System.err.println(string);
- }
- // 每月2号凌晨12点执行的定时任务
-// @Scheduled(cron = "0 0 0 2 * ?")
- // 每天凌晨12点执行的定时任务
-@Scheduled(cron = "0 0 0 * * ?")
-//@Scheduled(fixedRate = 60000)
+ @Scheduled(cron = "0 0 0 2 * ?")
public void taskMonth() {
try {
// 获取上个月的开始和结束日期
@@ -128,7 +116,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);
@@ -142,7 +130,7 @@
}
}
- // 每天晚上23:59:59执行的定时任务
+ // 每个月最后一天23点执行的定时任务
@Scheduled(cron = "0 0 23 * * ?")
public void taskLastDay() {
try {
@@ -156,10 +144,10 @@
LocalDateTime endDateTime = lastDayOfLastMonth.atTime(23, 59, 59); // 设定到最后一秒
// 构建查询条件
LambdaQueryWrapper<TChargingBill> queryWrapper = new LambdaQueryWrapper<>();
-// queryWrapper.ge(TChargingBill::getBillTime,
-// Date.from(startDateTime.atZone(ZoneId.systemDefault()).toInstant()))
-// .le(TChargingBill::getBillTime,
-// Date.from(endDateTime.atZone(ZoneId.systemDefault()).toInstant())); // 使用 le 包括最后一天的记录
+ queryWrapper.ge(TChargingBill::getBillTime,
+ Date.from(startDateTime.atZone(ZoneId.systemDefault()).toInstant()))
+ .le(TChargingBill::getBillTime,
+ Date.from(endDateTime.atZone(ZoneId.systemDefault()).toInstant())); // 使用 le 包括最后一天的记录
List<TChargingBill> list = chargingBillService.list(queryWrapper);
for (TChargingBill tChargingBill : list) {
tChargingBill.setStatus(2);
--
Gitblit v1.7.1