cqpCow il y a 1 an
Parent
commit
fc1138333f
3 fichiers modifiés avec 17 ajouts et 2 suppressions
  1. 1 1
      app/Service/PurchaseOrderService.php
  2. 1 1
      app/Service/Service.php
  3. 15 0
      app/Service/Wx/Service.php

+ 1 - 1
app/Service/PurchaseOrderService.php

@@ -293,7 +293,7 @@ class PurchaseOrderService extends Service
                 'del_time'=>time()
             ]);
             $old = PurchaseOrderFile::where('del_time',0)
-                ->where('purchase_order_id',$data['id'])
+                ->where('purchase_order_id',$order['id'])
                 ->whereIn('type',[PurchaseOrderFile::type_one])
                 ->select('file')
                 ->get()->toArray();

+ 1 - 1
app/Service/Service.php

@@ -463,7 +463,7 @@ class Service
         return true;
     }
 
-    public function delStorageFile($old, $new, $dir = "upload_files/"){
+    public function delStorageFile($old, $new = [], $dir = "upload_files/"){
         foreach ($old as $value){
             if(! in_array($value, $new)){
                 $filename_rep = "/api/uploadFiles/";

+ 15 - 0
app/Service/Wx/Service.php

@@ -4,6 +4,7 @@ namespace App\Service\Wx;
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Storage;
 
 
 /**
@@ -131,4 +132,18 @@ class Service
 
         return [false,'操作频繁, 请在 ' . $ttl . '秒后重试'];
     }
+
+    public function delStorageFile($old, $new = [], $dir = "upload_files/"){
+        foreach ($old as $value){
+            if(! in_array($value, $new)){
+                $filename_rep = "/api/uploadFiles/";
+                $filename = str_replace($filename_rep, "", $value);
+                $filePath = $dir . $filename;
+                if (Storage::disk('public')->exists($filePath)) {
+                    // 文件存在 进行删除操作
+                    Storage::disk('public')->delete($filePath);
+                }
+            }
+        }
+    }
 }