修复错误

app/controller/api/Demo.php

@@ -30,34 +30,42 @@ class Demo extends BaseController
 {
     public function index()
     {
-        $mer_id = 65;
+        $mer_id = 36;
         $file = request()->file('file');
         $zip_name = explode('.', $file->getOriginalName())[0];
         // 上传到本地服务器
         $savename = \think\facade\Filesystem::putFile('zippic', $file);
         $dir = date('Y-m-d_H-i-s') . '_' . $mer_id;
-        $destination_path = public_path('uploads/pic/' . $dir.'_'.$zip_name);
+        $path = public_path('uploads/pic').$dir;
-        mkdir($destination_path, 0777, true);
-        $zipFile = new \PhpZip\ZipFile();
         try {
-            $zipFile
+            $zip = new ZipArchive;
-            ->openFile(public_path('uploads').$savename) // open archive from file
+            $filePath = public_path('uploads') . $savename;
-            ->extractTo($destination_path) // add an entry from the string
+            $zip->open($filePath);
-            // ->deleteFromRegex('~^\.~') // delete all hidden (Unix) files
+            for ($i = 0; $i < $zip->numFiles; $i++) {
-                ->close(); // close archive
+                $statInfo = $zip->statIndex($i, ZipArchive::FL_ENC_RAW);
-        } catch (\PhpZip\Exception\ZipException $e) {
+                $filename = $this->transcoding($statInfo['name']);
-            throw new \think\exception\HttpException(404,$e->getMessage());
+                $mkdFile = explode('/',$filename);
-        } finally {
+                if ($statInfo['crc'] == 0) {
-            $zipFile->close();
+                    // 新建目录
+                    if (!file_exists($path . '/' . $filename)) {
+                        mkdir($path . '/' . $filename, 0777, true);
+                    }
+                } else {
+                    // 拷贝文件
+                    if(count($mkdFile)==3){
+                        if (!file_exists($path . '/' . $mkdFile[0].'/'.$mkdFile[1])) {
+                            mkdir($path . '/' .$mkdFile[0].'/'.$mkdFile[1], 0777, true);
+                        }
+                        copy('zip://' . $file . '#' . $zip->getNameIndex($i), $path . '/' . $filename);
+                    }
+                }
+            }
+            $zip->close();
+        } catch (\Exception $e) {
+            throw new \think\exception\HttpException(404, $e->getMessage() . '。line:' . $e->getLine());
         }
 
-        // if ($zip->open(public_path('uploads').$savename) === TRUE) {
+        $directory = $path.'/'.$zip_name;
-        //     $zip->extractTo($destination_path);
-        //     $zip->close();
-        // } else {
-        //     throw new \think\exception\HttpException(404, '解压失败');
-        // }
-        $directory = $destination_path;
         $files = scandir($directory);
         $dir = 'def/' . date('Y-m-d');
         $upload = UploadService::create();
@@ -96,7 +104,7 @@ class Demo extends BaseController
                     }
                     /**详情图 */
                     if (is_numeric($arr[0])) {
-                        $details[] = $directory . '/' . $file_two;
+                        $details[] = $directory . '/' .$file.'/'. $file_two;
                         continue;
                     }
                     /**sku图 */
@@ -150,8 +158,9 @@ class Demo extends BaseController
                         }
                     } else {
                         $update_content['product_id'] = $find['product_id'];
-                        Db::name('store_product_content')
+                        $a=Db::name('store_product_content')
                             ->insert(['product_id' => $find['product_id'], 'type' => 1, 'content' => json_encode($update_content)]);
+                            halt($a,2222);
                     }
                 } catch (Exception $e) {
                     halt($e->getMessage(), $e->getLine());

crmeb/jobs/ImportPicJob.php

@@ -59,7 +59,7 @@ class ImportPicJob implements JobInterface
                         }
                         /**详情图 */
                         if (is_numeric($arr[0])) {
-                            $details[] = $directory . '/' . $file_two;
+                            $details[] = $directory . '/' .$file.'/'. $file_two;
                             continue;
                         }
                         /**sku图 */
@@ -107,7 +107,7 @@ class ImportPicJob implements JobInterface
                         if (isset($update_content['image']) && !empty($update_content['image'])) {
                             Db::name('store_product_content')
                                 ->where(['product_id' => $find['product_id']])
-                                ->update(['content' => json_encode($update_content)]);
+                                ->update(['content' => json_encode($update_content),'type'=>1]);
                         }
                     } else {
                         $update_content['product_id'] = $find['product_id'];
@@ -136,7 +136,7 @@ class ImportPicJob implements JobInterface
     public function create_product_import_log($data, $status = 1)
     {
         $data = [
-            'product_id' => $data['product_id'],
+            'product_id' => $data['product_id']??0,
             'mer_id' => $data['mer_id'],
             'name' => $data['store_name'],
             'content' => $data['content'] ?? '',