Merge branch 'cloud_configs_dir_fix' into smart-shooter-clothing

python/custom_plugins/plugins/detail_template/huilima/detail_huilima1.py

@@ -133,14 +133,28 @@ class DetailPicGet(DetailBase):
 
     #模特图
     def deal_pic_1_2(self):
-        if self.get_text_value("模特图"):
-            return self.concatAigcImage(self.get_text_value("模特图"),resize=1200)
+        detailed_images = []
+        for pic_data in self.goods_no_value["货号资料"]:
+            model_image = pic_data.get("模特图",None)
+            if model_image:
+                scene_image_copy = self.concatAigcImage(model_image,resize=1600)
+                if scene_image_copy:
+                    detailed_images.append(scene_image_copy)
+        if len(detailed_images) >0:
+            return PictureProcessing(im=self.add_pic(detailed_images))
         else:
             return
     #场景图
     def deal_pic_1_3(self):
-        if self.get_text_value("场景图"):
-            return self.concatAigcImage(self.get_text_value("场景图"),resize=1200)
+        detailed_images = []
+        for pic_data in self.goods_no_value["货号资料"]:
+            scene_image = pic_data.get("场景图",None)
+            if scene_image:
+                scene_image_copy = self.concatAigcImage(scene_image,resize=1600)
+                if scene_image_copy:
+                    detailed_images.append(scene_image_copy)
+        if len(detailed_images) >0:
+            return PictureProcessing(im=self.add_pic(detailed_images))
         else:
             return
 

python/custom_plugins/plugins/detail_template/huilima/detail_huilima2.py

@@ -207,14 +207,28 @@ class DetailPicGet(DetailBase):
 
     # 模特图
     def deal_pic_3_2(self):
-        if self.get_text_value("模特图"):
-            return self.concatAigcImage(self.get_text_value("模特图"),resize=1600)
+        detailed_images = []
+        for pic_data in self.goods_no_value["货号资料"]:
+            model_image = pic_data.get("模特图",None)
+            if model_image:
+                scene_image_copy = self.concatAigcImage(model_image,resize=1600)
+                if scene_image_copy:
+                    detailed_images.append(scene_image_copy)
+        if len(detailed_images) >0:
+            return PictureProcessing(im=self.add_pic(detailed_images))
         else:
             return
     # 场景图
     def deal_pic_3_3(self):
-        if self.get_text_value("场景图"):
-           return self.concatAigcImage(self.get_text_value("场景图"),resize=1600)
+        detailed_images = []
+        for pic_data in self.goods_no_value["货号资料"]:
+            scene_image = pic_data.get("场景图",None)
+            if scene_image:
+                scene_image_copy = self.concatAigcImage(scene_image,resize=1600)
+                if scene_image_copy:
+                    detailed_images.append(scene_image_copy)
+        if len(detailed_images) >0:
+            return PictureProcessing(im=self.add_pic(detailed_images))
         else:
             return
 

python/custom_plugins/plugins/detail_template/huilima/detail_huilima3.py

@@ -216,14 +216,28 @@ class DetailPicGet(DetailBase):
 
     # 模特图
     def deal_pic_2_2(self):
-        if self.get_text_value("模特图"):
-            return self.concatAigcImage(self.get_text_value("模特图"),resize=1600)
+        detailed_images = []
+        for pic_data in self.goods_no_value["货号资料"]:
+            scene_image = pic_data.get("模特图",None)
+            if scene_image:
+                scene_image_copy = self.concatAigcImage(scene_image,resize=1600)
+                if scene_image_copy:
+                    detailed_images.append(scene_image_copy)
+        if len(detailed_images) >0:
+            return PictureProcessing(im=self.add_pic(detailed_images))
         else:
             return
     # 场景图
     def deal_pic_2_3(self):
-        if self.get_text_value("场景图"):
-            return self.concatAigcImage(self.get_text_value("场景图"),resize=1600)
+        detailed_images = []
+        for pic_data in self.goods_no_value["货号资料"]:
+            scene_image = pic_data.get("场景图",None)
+            if scene_image:
+                scene_image_copy = self.concatAigcImage(scene_image,resize=1600)
+                if scene_image_copy:
+                    detailed_images.append(scene_image_copy)
+        if len(detailed_images) >0:
+            return PictureProcessing(im=self.add_pic(detailed_images))
         else:
             return
 

python/custom_plugins/plugins/detail_template/huilima/detail_huilima4.py

@@ -226,14 +226,28 @@ class DetailPicGet(DetailBase):
 
     # 模特图
     def deal_pic_3_2(self):
-        if self.get_text_value("模特图"):
-            return self.concatAigcImage(self.get_text_value("模特图"),resize=1600)
+        detailed_images = []
+        for pic_data in self.goods_no_value["货号资料"]:
+            scene_image = pic_data.get("模特图",None)
+            if scene_image:
+                scene_image_copy = self.concatAigcImage(scene_image,resize=1600)
+                if scene_image_copy:
+                    detailed_images.append(scene_image_copy)
+        if len(detailed_images) >0:
+            return PictureProcessing(im=self.add_pic(detailed_images))
         else:
             return
     # 场景图
     def deal_pic_3_3(self):
-        if self.get_text_value("场景图"):
-            return self.concatAigcImage(self.get_text_value("场景图"),resize=1600)
+        detailed_images = []
+        for pic_data in self.goods_no_value["货号资料"]:
+            scene_image = pic_data.get("场景图",None)
+            if scene_image:
+                scene_image_copy = self.concatAigcImage(scene_image,resize=1600)
+                if scene_image_copy:
+                    detailed_images.append(scene_image_copy)
+        if len(detailed_images) >0:
+            return PictureProcessing(im=self.add_pic(detailed_images))
         else:
             return
 

python/custom_plugins/plugins/detail_template/huilima/detail_huilima5.py

@@ -419,15 +419,29 @@ class DetailPicGet(DetailBase):
 
     # 模特图
     def deal_pic_6_2(self):
-        if self.get_text_value("模特图"):
-            return self.concatAigcImage(self.get_text_value("模特图"),resize=1600)
+        detailed_images = []
+        for pic_data in self.goods_no_value["货号资料"]:
+            scene_image = pic_data.get("模特图",None)
+            if scene_image:
+                scene_image_copy = self.concatAigcImage(scene_image,resize=1600)
+                if scene_image_copy:
+                    detailed_images.append(scene_image_copy)
+        if len(detailed_images) >0:
+            return PictureProcessing(im=self.add_pic(detailed_images))
         else:
             return
 
     # 场景图
     def deal_pic_6_3(self):
-        if self.get_text_value("场景图"):
-            return self.concatAigcImage(self.get_text_value("场景图"),resize=1600)
+        detailed_images = []
+        for pic_data in self.goods_no_value["货号资料"]:
+            scene_image = pic_data.get("场景图",None)
+            if scene_image:
+                scene_image_copy = self.concatAigcImage(scene_image,resize=1600)
+                if scene_image_copy:
+                    detailed_images.append(scene_image_copy)
+        if len(detailed_images) >0:
+            return PictureProcessing(im=self.add_pic(detailed_images))
         else:
             return
 

python/custom_plugins/plugins_mode/detail_generate_base.py

@@ -208,9 +208,13 @@ class DetailBase(object):
             out_put_dir=self.out_put_dir
         )
         for pic_data in self.goods_no_value["货号资料"]:
-            scene_image = pic_data["场景图"]
-            model_image = pic_data["模特图"]
-            goods_art_no = pic_data["货号"]
+            print("正在复制 pic_data",pic_data)
+            scene_image = pic_data.get("场景图",None)
+            model_image = pic_data.get("模特图",None)
+            goods_art_no = pic_data.get("货号",None)
+            print("正在复制 scene_image",scene_image)
+            print("正在复制 model_image",model_image)
+            print("正在复制===================================>")
             # {out_put_dir}/{goods_number}
             # 资料长度，决定是否添加货号后缀
             goods_art_lens = len(self.goods_no_value["货号资料"])
@@ -234,6 +238,7 @@ class DetailBase(object):
                     "RGB", (mote_img.width, mote_img.height), bg_color
                 )
                 bg_img = bg_img.paste_img(top_img=mote_img, base="nc", value=(0, 0))
+                print("拼接模特图场景图====>",image_path)
                 return bg_img
         except Exception as e:
              logger.info(f"copyImage 拼接模特图/场景图出错:{str(e)}")