From f9b7701967a77b2166a7272ebaf39218e06b40cf Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 24 十月 2024 13:44:10 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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..72c7985 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).
@@ -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);
--
Gitblit v1.7.1