From c7da74d85bfae8d9fef2abc23b9605669ad8c6d9 Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Sat, 10 May 2025 13:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hd/cloud/task/OrderCostCalculateTask.java | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/task/OrderCostCalculateTask.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/task/OrderCostCalculateTask.java
index 48fb972..7c478d1 100644
--- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/task/OrderCostCalculateTask.java
+++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/task/OrderCostCalculateTask.java
@@ -1,10 +1,6 @@
 package com.evotech.hd.cloud.task;
 
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.evotech.hd.cloud.service.OrderSwapBatteryService;
 import com.evotech.hd.cloud.service.newthread.GZHTemplateMessageService;
@@ -12,10 +8,13 @@ import com.evotech.hd.common.core.dao.cloud.OrderSwapBatteryDao;
 import com.evotech.hd.common.core.entity.Result;
 import com.evotech.hd.common.core.entity.cloud.OrderSwapBattery;
 import com.evotech.hd.common.core.enums.CodeMsg;
-
-import cn.hutool.core.date.DateUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
 
 
 @Component
@@ -35,19 +34,21 @@ public class OrderCostCalculateTask {
 	public void calculateOrder() {
 		log.info("\r\n===>>>开始查找订单计算费用");
 		// 查询状态为5的订单
-		Boolean flag = true;
+//		Boolean flag = true;
 		int n = 0;
-		while (flag) {
+//		while (flag) {
 			List<OrderSwapBattery> list = orderSwapBatteryDao.selectList(new QueryWrapper<OrderSwapBattery>()
 					.eq("status", 5).ne("del_flag", 1)
 					.ge("order_time", DateUtil.beginOfYear(new Date()))
 					.last("limit 20"));
 			if (!list.isEmpty()) {
 				n = orderCalculate(n, list);
-			} else {
-				flag = false;
+//				flag = false;
 			}
-		}
+//			else {
+//				flag = false;
+//			}
+//		}
 		
 		log.info("\r\n===>>>订单计算费用完成：{} 条数据", n);