From b1c917a344e6240a013d0c0fc0a67e3de02afb7e Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期日, 13 七月 2025 23:15:27 +0800
Subject: [PATCH] 修改状态

---
 src/main/java/com/linghu/controller/CollectController.java |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/linghu/controller/CollectController.java b/src/main/java/com/linghu/controller/CollectController.java
index 1ace567..f435bea 100644
--- a/src/main/java/com/linghu/controller/CollectController.java
+++ b/src/main/java/com/linghu/controller/CollectController.java
@@ -944,6 +944,18 @@
                         System.out.println("订单[" + orderId + "]下无关键词,跳过状态更新");
                         return;
                     }
+                boolean  allValid2 = orderKeywords.stream()
+                        .allMatch(k -> "completed".equals(k.getStatus()) || "false".equals(k.getStatus()) || "canceled".equals(k.getStatus()));
+                if (allValid2) {
+                    Orders orders = orderService.getById(orderId);
+                    if (orders != null) {
+                        orders.setStatus(1); // 假设Orders有Integer类型的status字段
+                        orderService.updateById(orders);
+                        System.out.println("订单[" + orderId + "]所有关键词采集完成或者取消,已更新状态为1");
+                    } else {
+                        System.out.println("未找到订单[" + orderId + "],无法更新状态");
+                    }
+                }
                     // 3. 检查所有关键词的状态是否均为 completed 或 false
                     boolean allValid = orderKeywords.stream()
                             .allMatch(k -> "completed".equals(k.getStatus()) || "false".equals(k.getStatus()));
@@ -959,18 +971,7 @@
                             System.out.println("未找到订单[" + orderId + "],无法更新状态");
                         }
                     }
-                boolean  allValid2 = orderKeywords.stream()
-                        .allMatch(k -> "completed".equals(k.getStatus()) || "false".equals(k.getStatus()) || "canceled".equals(k.getStatus()));
-                if (allValid) {
-                    Orders orders = orderService.getById(orderId);
-                    if (orders != null) {
-                        orders.setStatus(1); // 假设Orders有Integer类型的status字段
-                        orderService.updateById(orders);
-                        System.out.println("订单[" + orderId + "]所有关键词采集完成或者取消,已更新状态为1");
-                    } else {
-                        System.out.println("未找到订单[" + orderId + "],无法更新状态");
-                    }
-                }
+
 
                 Orders orders = orderService.getById(keyword.getOrder_id());
 

--
Gitblit v1.7.1