From 62f5ede4baae074e984fff96e7bbf9abc35729f1 Mon Sep 17 00:00:00 2001
From: dongchangxi <458593490@qq.com>
Date: Fri, 28 Mar 2025 17:14:12 +0800
Subject: [PATCH] 1

---
 blender/build_resize_model.py | 1 +
 blender/fill_dm_code_new.py   | 7 ++++++-
 build_print_obj.py            | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/blender/build_resize_model.py b/blender/build_resize_model.py
index 1557c8e..c8aa850 100644
--- a/blender/build_resize_model.py
+++ b/blender/build_resize_model.py
@@ -206,6 +206,7 @@ def main():
         bpy.ops.export_scene.obj(filepath=os.path.join(path, f'{pid}_decimate.obj'))
         bpy.ops.export_scene.gltf(filepath=os.path.join(path, f'{pid}_decimate.glb'), export_format='GLB', export_apply=True, export_jpeg_quality=100)
         config.oss_bucket.put_object_from_file(f'glbs/3d/{pid}.glb', os.path.join(path, f'{pid}_decimate.glb'))
+        config.oss_bucket.put_object_from_file(f'glbs/3d/order_id/{orderId}.glb', os.path.join(path, f'{pid}_decimate.glb'))
     bpy.ops.wm.quit_blender()
 
 
diff --git a/blender/fill_dm_code_new.py b/blender/fill_dm_code_new.py
index 00aa37e..252e3e0 100644
--- a/blender/fill_dm_code_new.py
+++ b/blender/fill_dm_code_new.py
@@ -83,9 +83,12 @@ def down_obj_fromoss(pid, print_type=1, order_id=None):
         path = os.path.join(workdir, pid)
     if os.path.exists(path):
         print(f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())} pid: {pid} 已存在模型文件，删除后重新下载')
+        print("AAAAAAAAAAAA")
         shutil.rmtree(path, ignore_errors=True)
+        print("BBBBBBBBBBBBBBB")
     os.makedirs(path)
     
+    print("准备下载,获取ossPath")
     prefix = f'objs/print/{pid}'
     #根据order_id 获取文件在 oss 上的存储路径
     if order_id is not None:
@@ -525,7 +528,9 @@ def main(workdir, r, print_id):
     order_id = arrResText['data']['order_id'] # order_id
     
     #文件路劲
-    filename = os.path.join(workdir, f'{pid}_{order_id}', find_obj(pid, order_id))
+    tempName = find_obj(pid, order_id)
+    print("tempName",tempName)
+    filename = os.path.join(workdir, f'{pid}_{order_id}', tempName)
     print('导入obj文件：', filename)
     
     #获取该笔订单的坐标
diff --git a/build_print_obj.py b/build_print_obj.py
index 53967f8..bcbe4ff 100644
--- a/build_print_obj.py
+++ b/build_print_obj.py
@@ -228,8 +228,8 @@ def make3d4print_task(r):
         return
     
     #根据 buy_type 判断 是否是冰箱贴 或者徽章
-    buyType = str(res['buy_type'])
-    if buyType == "2" or buyType == "3": #or buyType == "4" 小尺寸需要缩放
+    noresize = str(res['noresize'])
+    if noresize == "1":
         #塞入到no_resize 队列
         r.lpush("model:noresize", orderId)
         return