From 25362a910224c9ca3f58b0cac4fe3d381eeba8df Mon Sep 17 00:00:00 2001
From: lq <workerqi@163.com>
Date: Wed, 4 Dec 2024 10:06:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/foundation/JsonResponseFormatter.php |  7 ++-----
 common/jobs/LogJob.php                     | 13 ++++++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/admin/foundation/JsonResponseFormatter.php b/admin/foundation/JsonResponseFormatter.php
index 43dc70f..4164d39 100644
--- a/admin/foundation/JsonResponseFormatter.php
+++ b/admin/foundation/JsonResponseFormatter.php
@@ -117,8 +117,6 @@ class JsonResponseFormatter extends \yii\web\JsonResponseFormatter
             self::$param['result'] = $data;
             self::$param['url'] = Yii::$app->request->getUrl();
             self::$param['type'] = $response->statusCode == 200? 0: 1;
-            self::$param['platform_type'] = Yii::$app->store == 0? 0: 1;
-            self::$param['platform_id'] = Yii::$app->store?? 0;
             $op = get_device_type();
             self::$param['ip'] = $op['ip'];
             self::$param['equipment'] = $op['platform'];
@@ -128,9 +126,8 @@ class JsonResponseFormatter extends \yii\web\JsonResponseFormatter
             } else {
                 self::$param['user_id'] = Yii::$app->user->id;
             }
-            \Yii::$app->queue->push(new LogJob([
-                'params' => self::$param
-            ]));
+            // 日志队列
+            \Yii::$app->queue->push(new LogJob(['params' => self::$param]));
 
             $response->data = self::formatData($data, $errcode, $msg);
             $response->content = Json::encode($response->data, $options);
diff --git a/common/jobs/LogJob.php b/common/jobs/LogJob.php
index 17fa9c3..d3f7c49 100644
--- a/common/jobs/LogJob.php
+++ b/common/jobs/LogJob.php
@@ -2,6 +2,7 @@
 namespace common\jobs;
 
 use common\core\BaseModel;
+use common\models\Admin;
 use common\models\OpLog;
 use common\models\PrescriptionLog;
 use common\models\ProductOrder;
@@ -23,10 +24,12 @@ class LogJob extends BaseJob implements JobInterface
      */
     public function execute($queue)
     {
-        echo '日志队列开始：'. "\r\n";
+        echo date('Y-m-d H:i:s'). '- 日志队列开始：'. "\r\n";
         try {
             $this->setRequest();
             $param = $this->params;
+            $userInfo = Admin::find()->where(['uid' => $param['user_id']])->one();
+
             $opLogModel = new OpLog();
             $opLogModel->user_id = $param['user_id'];
             $opLogModel->url = $param['url'];
@@ -34,16 +37,16 @@ class LogJob extends BaseJob implements JobInterface
             $opLogModel->ip = $param['ip'];
             $opLogModel->param = json_encode($param['param']);
             $opLogModel->result = json_encode($param['result']);
-            $opLogModel->platform_type = $param['platform_type'];
-            $opLogModel->platform_id = $param['platform_id'];
+            $opLogModel->platform_type = empty($userInfo['store_id'])? 0: 1;
+            $opLogModel->platform_id = empty($userInfo['store_id'])? 0: $userInfo['store_id'];
             $opLogModel->equipment = $param['equipment'];
             $opLogModel->browser = $param['browser'];
             $opLogModel->created_at = date('Y-m-d H:i:s');
             $opLogModel->saveOrFail();
 
-            echo '日志队列结束：'. "\r\n";
+            echo date('Y-m-d H:i:s'). '- 日志队列结束：'. "\r\n";
         } catch (\Exception $exception) {
-            echo '日志队列异常：'. $exception->getMessage(). "\r\n";
+            echo date('Y-m-d H:i:s'). '- 日志队列异常：'. $exception->getMessage(). "\r\n";
             return;
         }
     }