Quellcode durchsuchen

[智价云] 清洗记录信息更新

tangyuanwang vor 2 Monaten
Ursprung
Commit
3c69e207a7

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

@@ -255,8 +255,8 @@ class ControlGoods extends Controller
     {
         // 验证参数
         $request->scene('data_cleaning')->validate();
-        $access_token = request('access_token', '');
-        $admin_id = $access_token['uid'];
+        $admin_id   = request('access_token.uid', 0); //用户ID
+        $is_admin   = request('access_token.is_admin', 0); //是否管理员操作 0=是1=否
         $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id];
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '执行成功']);

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

@@ -596,9 +596,9 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('data_cleaning')->validate();
-        $access_token = request('access_token', '');
-        $admin_id = $access_token['uid'];
-        $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id];
+        $admin_id   = request('access_token.uid', 0); //用户ID
+        $is_admin   = request('access_token.is_admin', 0); //是否管理员操作 0=是1=否
+        $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id,'is_admin' => $is_admin];
         LowPriceGoodsJobs::dispatch($message_data);
         // LowPriceGoodsJobs::dispatchSync($message_data);
         // 告知结果

+ 3 - 3
app/Http/Controllers/Manager/Process/ViolationProduct.php

@@ -591,9 +591,9 @@ class ViolationProduct extends Controller
     {
         // 验证参数
         $request->scene('data_cleaning')->validate();
-        $access_token = request('access_token', '');
-        $admin_id = $access_token['uid'];
-        $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id];
+        $admin_id   = request('access_token.uid', 0); //用户ID
+        $is_admin   = request('access_token.is_admin', 0); //是否管理员操作 0=是1=否
+        $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id, 'is_admin' => $is_admin];
         ViolationProductJobs::dispatch($message_data);
         // ViolationProductJobs::dispatchSync($message_data);
         // 告知结果

+ 3 - 3
app/Http/Controllers/Manager/Process/ViolationStore.php

@@ -560,9 +560,9 @@ class ViolationStore extends Controller
     {
         // 验证参数
         $request->scene('data_cleaning')->validate();
-        $access_token = request('access_token', '');
-        $admin_id = $access_token['uid'];
-        $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id];
+        $admin_id   = request('access_token.uid', 0); //用户ID
+        $is_admin   = request('access_token.is_admin', 0); //是否管理员操作 0=是1=否
+        $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id, 'is_admin' => $is_admin];
         ViolationStoreJobs::dispatch($message_data);
         // ViolationStoreJobs::dispatchSync($message_data);
         // 告知结果

+ 2 - 1
app/Jobs/Manager/Process/LowPriceGoodsJobs.php

@@ -49,9 +49,10 @@ class LowPriceGoodsJobs implements ShouldQueue
             $page = isset($this->message_data['page']) ? $this->message_data['page'] : 1;
             $executeLog_id = isset($this->message_data['executeLog_id']) ? $this->message_data['executeLog_id'] : 0;
             $admin_id = isset($this->message_data['admin_id']) ? $this->message_data['admin_id'] : 0;
+            $is_admin = isset($this->message_data['is_admin']) ? $this->message_data['is_admin'] : 0;
             if ($page == 1) {
                 $ExecuteLogModel = new ExecuteLogModel();
-                $insert_data = ['name' => '低价挂网商品', 'code' => 'LowPriceGoodsJobs', 'admin_id' => $admin_id];
+                $insert_data = ['name' => '低价挂网商品', 'code' => 'LowPriceGoodsJobs', 'admin_id' => $admin_id,'is_admin' => $is_admin];
                 $executeLog_id = $ExecuteLogModel->addExecuteLog_content($insert_data);
             }
             $list_config_data = $ConfigLowPriceGoodsModel->leftjoin('washconfig_product_category', 'washconfig_product_category.id', '=', 'washconfig_lowprice_product.category_id')

+ 2 - 1
app/Jobs/Manager/Process/ViolationProductJobs.php

@@ -48,9 +48,10 @@ class ViolationProductJobs implements ShouldQueue
             $page = isset($this->message_data['page']) ? $this->message_data['page'] : 1;
             $executeLog_id = isset($this->message_data['executeLog_id']) ? $this->message_data['executeLog_id'] : 0;
             $admin_id = isset($this->message_data['admin_id']) ? $this->message_data['admin_id'] : 0;
+            $is_admin = isset($this->message_data['is_admin']) ? $this->message_data['is_admin'] : 0;
             if($page == 1){
                 $ExecuteLogModel = new ExecuteLogModel();
-                $insert_data =['name' =>'违规挂网商品', 'code' => 'ViolationProductJobs', 'admin_id' => $admin_id];
+                $insert_data =['name' =>'违规挂网商品', 'code' => 'ViolationProductJobs', 'admin_id' => $admin_id,'is_admin' => $is_admin];
                 $executeLog_id=$ExecuteLogModel->addExecuteLog_content($insert_data);
             }
             $list_config_data = $ConfigViolationProductModel->leftjoin('washconfig_product_category', 'washconfig_product_category.id', '=', 'washconfig_violation_product.category_id')

+ 2 - 1
app/Jobs/Manager/Process/ViolationStoreJobs.php

@@ -46,9 +46,10 @@ class ViolationStoreJobs implements ShouldQueue
             $page = isset($this->message_data['page']) ? $this->message_data['page'] : 1;
             $executeLog_id = isset($this->message_data['executeLog_id']) ? $this->message_data['executeLog_id'] : 0;
             $admin_id = isset($this->message_data['admin_id']) ? $this->message_data['admin_id'] : 0;
+            $is_admin = isset($this->message_data['is_admin']) ? $this->message_data['is_admin'] : 0;
             if($page == 1){
                 $ExecuteLogModel = new ExecuteLogModel();
-                $insert_data =['name' =>'违规挂网店铺', 'code' => 'ViolationStoreJobs', 'admin_id' => $admin_id];
+                $insert_data =['name' =>'违规挂网店铺', 'code' => 'ViolationStoreJobs', 'admin_id' => $admin_id,'is_admin' => $is_admin];
                 $executeLog_id=$ExecuteLogModel->addExecuteLog_content($insert_data);
             }
             $list_config_data = $ViolationStoreModel->leftjoin('washconfig_company_category', 'washconfig_company_category.id', '=', 'washconfig_violation_store.category_id')