Merge branch 'v4.7.0dev' into v5.0.0dev

crmeb/app/jobs/ProductCopyJob.php

@@ -48,7 +48,7 @@ class ProductCopyJob extends BaseJobs
                 $d_image = 'http://' . ltrim($image, '\//');
             }
             $description_cache = CacheService::get('desc_images_' . $id);
-            if ($description_cache === null) {
+            if ($description_cache === null || $description_cache === '') {
                 $description_cache = $description;
                 CacheService::set('desc_images_count' . $id, 0);
             }
@@ -64,7 +64,7 @@ class ProductCopyJob extends BaseJobs
                 CacheService::set('desc_images_count' . $id, $desc_count);
             }
         } catch (\Throwable $e) {
-            Log::error('下载商品详情图片失败，失败原因:' . $e->getMessage());
+            Log::error('下载商品详情图片失败，失败原因:' . $e->getMessage() . '_' . $e->getFile() . '_' . $e->getLine());
         }
         return true;
     }
@@ -86,9 +86,9 @@ class ProductCopyJob extends BaseJobs
             //下载图片
             $res = $copyTaobao->downloadCopyImage($image);
             //获取缓存中的轮播图
-            $slider_images = CacheService::get('slider_images_' . $id);
+            $slider_images = CacheService::get('slider_images_' . $id) ?? [];
             //缓存为null则赋值[]
-            if ($slider_images === null) $slider_images = [];
+            if ($slider_images === null || $slider_images === '') $slider_images = [];
             //将下载的图片插入数组
             array_push($slider_images, $res);
             //如果$slider_images中图片数量和传入的$count相等，说明已经下载完成，写入商品表，如果不等则继续插入缓存
@@ -102,7 +102,7 @@ class ProductCopyJob extends BaseJobs
                 CacheService::set('slider_images_' . $id, $slider_images);
             }
         } catch (\Throwable $e) {
-            Log::error('下载商品轮播图片失败，失败原因:' . $e->getMessage());
+            Log::error('下载商品轮播图片失败，失败原因:' . $e->getMessage() . '_' . $e->getFile() . '_' . $e->getLine());
         }
         return true;
     }