From 707e75fddf2e4c63d72c6c40b49c3dfa9cb0bb65 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 14:51:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
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 b6a4265..97a7ab7 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
@@ -47,11 +47,14 @@
// @Scheduled(cron = "0 0 0 2 * ?")
// 每天凌晨12点执行的定时任务
+
+// @Scheduled(cron = "0 0 12 * * ?")
@Scheduled(cron = "0 0 12 2 * ?")
// 每30秒执行一次的定时任务
@Scheduled(cron = "0/30 * * * * ?")
public void taskMonth() {
try {
+ System.err.println("执行定时任务生成账单");
// 获取上个月的开始和结束日期
LocalDate firstDayOfLastMonth = LocalDate.now().minusMonths(1).
withDayOfMonth(2);
@@ -67,6 +70,7 @@
.collect(Collectors.joining()); // 将其连接成一个字符串
tChargingBill.setCode("JSD"+string+randomDigits );
tChargingBill.setType(1);
+ tChargingBill.setSiteId(0);
tChargingBill.setBillTime(LocalDateTime.now());
tChargingBill.setStatus(1);
tChargingBill.setOrderState(2);
@@ -74,13 +78,13 @@
// 每月二号给每个站点生成上月账单
List<Integer> collect = siteClient.getSiteAll().getData().stream().map(Site::getId).collect(Collectors.toList());
List<TChargingBill> tChargingBills = new ArrayList<>();
- for (int i = 1; i <= collect.size(); i++) {
+ for (int i = 0; i < collect.size(); i++) {
TChargingBill tChargingBill1 = new TChargingBill();
Random random1 = new Random();
String randomDigits1 = random1.ints(10, 0, 10) // 生成10个随机数字，范围在0-9
.mapToObj(String::valueOf)
.collect(Collectors.joining()); // 将其连接成一个字符串
- tChargingBill1.setCode("JSD"+string+randomDigits1+i );
+ tChargingBill1.setCode("JSD"+string+randomDigits1+(i+1) );
tChargingBill1.setType(2);
tChargingBill1.setSiteId(collect.get(i));
tChargingBill1.setBillTime(LocalDateTime.now());
@@ -88,6 +92,7 @@
tChargingBill1.setOrderState(2);
tChargingBills.add(tChargingBill1);
}
+ System.err.println("列表"+tChargingBills);
if (!tChargingBills.isEmpty())chargingBillService.saveBatch(tChargingBills);
} catch (Exception e) {
--
Gitblit v1.7.1