Преглед на файлове

[智价云] 导出更新

public преди 11 часа
родител
ревизия
8197d78935
променени са 2 файла, в които са добавени 8 реда и са изтрити 8 реда
  1. 2 2
      app/Http/Controllers/Manager/Process/LowPriceGoods.php
  2. 6 6
      app/Jobs/Manager/Other/ExportLowPriceGoodsJobs.php

+ 2 - 2
app/Http/Controllers/Manager/Process/LowPriceGoods.php

@@ -416,8 +416,8 @@ class LowPriceGoods extends Controller
         $fileName = '低价挂网商品数据' . $fileId . '.xlsx';
         $message_data['company_id']    = $low_price_goods_where['company_id'];
         $message_data['user_id']    = $message_data['user_id'];
-        // ExportLowPriceGoodsJobs::dispatch($message_data);
-        ExportLowPriceGoodsJobs::dispatchSync($message_data);
+        ExportLowPriceGoodsJobs::dispatch($message_data);
+        // ExportLowPriceGoodsJobs::dispatchSync($message_data);
         return json_send(['code' => 'success', 'msg' => '导出任务添加成功', 'data' => ['file_id' => $fileId, 'file_name' => $fileName]]);
     }
 

+ 6 - 6
app/Jobs/Manager/Other/ExportLowPriceGoodsJobs.php

@@ -84,9 +84,9 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         $LowPriceGoodsModel = new LowPriceGoodsModel();
         $LowPriceGoodsMemberModel = new LowPriceGoodsMemberModel();
         $admin_company_id = $message_data['admin_company_id'] ?? '0';
-        $company_id = $message_data['access_token']['company_id'] ?? '0';
-        $is_admin = $message_data['access_token']['is_admin'] ?? '0'; //是否管理员操作 0=是1=否
-        $user_id = $message_data['access_token']['uid'] ?? 0;
+        $company_id = $message_data['company_id'];
+        $is_admin = $message_data['is_admin']; //是否管理员操作 0=是1=否
+        $user_id = $message_data['user_id'];
         $file_id = $message_data['file_id'];
         // 查询条件
         $map  = [];
@@ -219,9 +219,9 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         $query = $LowPriceGoodsModel->where($map);
         if ($is_admin != 1 && $company_id != 0) {
             $query = $query->where(function ($q) use ($user_id) {
-                $q->where('first_responsible_person', 'like', "%,{$user_id},%")
-                    ->orWhere('responsible_person', 'like', "%,{$user_id},%")
-                    ->orWhere('source_responsible_person', 'like', "%,{$user_id},%");
+                $q->where('first_responsible_person', 'like', "%,$user_id,%")
+                    ->orWhere('responsible_person', 'like', "%,$user_id,%")
+                    ->orWhere('source_responsible_person', 'like', "%,$user_id,%");
             });
         }