From 9672c2bbcca604e385631095e171aa345f25c2cc Mon Sep 17 00:00:00 2001
From: "Mr. Shuixiang" <mr.shuixiang@aliyun.com>
Date: Thu, 1 Oct 2020 15:19:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E8=9B=BE=E6=89=93=E5=8D=B0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/JsonRpc/FeieService.php                         |  8 ++++++++
 app/Service/v3/Implementations/FeiePrintService.php | 13 +++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/app/JsonRpc/FeieService.php b/app/JsonRpc/FeieService.php
index 9ac61ef..5fc8214 100644
--- a/app/JsonRpc/FeieService.php
+++ b/app/JsonRpc/FeieService.php
@@ -3,6 +3,7 @@
 
 namespace App\JsonRpc;
 
+use App\Commons\Log;
 use App\Service\v3\Interfaces\FeiePrintServiceInterface;
 use Hyperf\RpcServer\Annotation\RpcService;
 
@@ -20,9 +21,16 @@ class FeieService implements PrintServiceInterface
      */
     private $feieprintService;
 
+    /**
+     * @Inject
+     * @var Log
+     */
+    protected $log;
+
     public function doPrint($oid)
     {
         // TODO: Implement doPrint() method.
+        $this->log->event('feieprint_rpc', ['global_order_id' => $oid]);
         return $this->feieprintService->feiePrint($oid);
 
     }
diff --git a/app/Service/v3/Implementations/FeiePrintService.php b/app/Service/v3/Implementations/FeiePrintService.php
index 858e7e0..fbfae9d 100644
--- a/app/Service/v3/Implementations/FeiePrintService.php
+++ b/app/Service/v3/Implementations/FeiePrintService.php
@@ -2,15 +2,24 @@
 
 namespace App\Service\v3\Implementations;
 
+use App\Commons\Log;
 use App\Constants\v3\Shipping;
 use App\Libs\FeiePrintClient;
 use App\Model\v3\Feprint;
 use App\Model\v3\OrderMain;
 use App\Service\v3\Interfaces\FeiePrintServiceInterface;
 use Hyperf\DbConnection\Db;
+use Hyperf\Di\Annotation\Inject;
 
 class FeiePrintService implements FeiePrintServiceInterface
 {
+
+    /**
+     * @Inject
+     * @var Log
+     */
+    protected $log;
+
     // *必填*：飞鹅云后台注册账号
     const  USER = '13161443713@163.com';
     // *必填*: 飞鹅云后台注册账号后生成的UKEY 【备注：这不是填打印机的KEY】
@@ -48,6 +57,7 @@ class FeiePrintService implements FeiePrintServiceInterface
                         $query->with('store','orderGoods');
                     }
                 ])->where('global_order_id',$globalOrderId)->first();
+        $this->log->event('feieprint_rpc', ['order_data' => json_encode($data)]);
         if (empty($data)) {
             return ;
         }
@@ -55,6 +65,7 @@ class FeiePrintService implements FeiePrintServiceInterface
         //     $item = (array)$item;
         // }
         $printSn = Feprint::query()->where('market_id',$data->market_id)->value('sn');
+        $this->log->event('feieprint_rpc', ['printSn' => json_encode($printSn)]);
         if (env('APP_ENV') === 'dev') {
             $client = new FeiePrintClient($this->feieHost, $this->feiePort);
             $msgInfo = array(
@@ -76,7 +87,9 @@ class FeiePrintService implements FeiePrintServiceInterface
             }
         }
         $content = $this->printFormat($data, 4, 14, 7, 7);
+        $this->log->event('feieprint_rpc', ['content' => json_encode($content)]);
         $res = $this->printMsg($printSn, $content, 1);
+        $this->log->event('feieprint_rpc', ['res' => json_encode($res)]);
         return $res;
     }