From 8c03af2214b4378ce6adfa1dbe1e82df807c9866 Mon Sep 17 00:00:00 2001
From: dongchangxi <458593490@qq.com>
Date: Mon, 4 Aug 2025 16:50:04 +0800
Subject: [PATCH] 1

---
 timer/external_order_glbV2.py | 34 +++++++++++++++-------------------
 timer/test_external_order.py  |  9 +++++----
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/timer/external_order_glbV2.py b/timer/external_order_glbV2.py
index b203661..479c38e 100644
--- a/timer/external_order_glbV2.py
+++ b/timer/external_order_glbV2.py
@@ -121,25 +121,6 @@ def checkDownloadFile(pid):
 
 #加载obj文件
 def reload_obj(pid,order_ids):
-    
-    #下载obj文件
-    down_obj_from_oss(config.workdir, pid, "print")
-
-    #检测mtl 文件是否正常，
-    isNormal = checkDownloadFile(pid)
-    if isNormal == False:
-        print(f'{pid}的mtl文件检测出现问题，不执行该笔任务,调用取消的接口')
-        for order_id in order_ids:
-            url = f"https://mp.api.suwa3d.com/api/order/cancelExternalOrder?id={order_id}&typename=system"
-            response = requests.get(url)
-            response = response.json()
-            if response['code'] != 1000:
-                continue
-            print(f'取消订单{order_id}成功')
-        return
-
-
-
     for order_id in order_ids:
         print(order_id)
         #url 请求
@@ -307,6 +288,21 @@ def export_and_update_glbs(pid,order_ids):
 
 def createGlb(pid,order_ids):
 
+    #下载obj文件
+    down_obj_from_oss(config.workdir, pid, "print")
+
+    #检测mtl 文件是否正常，
+    isNormal = checkDownloadFile(pid)
+    if isNormal == False:
+        print(f'{pid}的mtl文件检测出现问题，不执行该笔任务,调用取消的接口')
+        for order_id in order_ids:
+            url = f"https://mp.api.suwa3d.com/api/order/cancelExternalOrder?id={order_id}&typename=system"
+            response = requests.get(url)
+            response = response.json()
+            if response['code'] != 1000:
+                continue
+            print(f'取消订单{order_id}成功')
+        return
     
     base_fix(pid,order_ids)
     export_and_update_glbs(pid,order_ids)
diff --git a/timer/test_external_order.py b/timer/test_external_order.py
index 7abc9b6..e8dde99 100644
--- a/timer/test_external_order.py
+++ b/timer/test_external_order.py
@@ -48,10 +48,11 @@ def find_pid_objname(pid):
 
 def down_obj_from_oss(workdir, pid, action):
     if os.path.exists(os.path.join(workdir, action, pid)):
-        print(f'目录{os.path.join(workdir, action, pid)}已存在，跳过')
-        return
-    else:
-        os.makedirs(os.path.join(workdir, action, pid))
+        #print(f'目录{os.path.join(workdir, action, pid)}已存在，跳过')
+        #return
+        shutil.rmtree(os.path.join(workdir, action, pid))
+
+    os.makedirs(os.path.join(workdir, action, pid))
 
     # 根据前缀获取文件列表
     prefix = f'objs/print/{pid}/base/model/'