From 11b718b78ee92d2349072c972e7155001693d69e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 15:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 15 ++++++++++++---
1 files changed, 12 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 a1e684f..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
@@ -6,7 +6,9 @@
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.order.api.model.TChargingBill;
+import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.service.TChargingBillService;
+import com.ruoyi.order.service.TChargingOrderService;
import org.apache.logging.log4j.core.util.UuidUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -34,6 +36,8 @@
private TChargingBillService chargingBillService;
@Resource
private SiteClient siteClient;
+ @Resource
+ private TChargingOrderService chargingOrderService;
public static void main(String[] args) {
LocalDate firstDayOfLastMonth = LocalDate.now().minusMonths(1).
@@ -48,7 +52,7 @@
// 每天凌晨12点执行的定时任务
-@Scheduled(cron = "0 0 12 1 * ?")
+@Scheduled(cron = "0 0 0 * * ?")
//@Scheduled(fixedRate = 60000)
public void taskMonth() {
try {
@@ -104,6 +108,11 @@
.collect(Collectors.joining()); // 将其连接成一个字符串
tChargingBill2.setCode("JSD"+string+randomDigits2+(i+1) );
tChargingBill2.setType(2);
+ List<TChargingOrder> list = chargingOrderService.lambdaQuery()
+ .eq(TChargingOrder::getSiteId, collect.get(i)).list();
+ if (list.isEmpty()){
+ continue;
+ }
tChargingBill2.setSiteId(collect.get(i));
tChargingBill2.setBillTime(LocalDateTime.now());
tChargingBill2.setBillType(1);
@@ -119,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);
@@ -134,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