From d53bc3ee8be9ccb6eac4f82eb1f5c95384f6c487 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Wed, 16 Sep 2020 10:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=86=E5=A4=A9=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/JsonRpc/OrderonlineServiceInterface.php              | 8 --------
 .../{OrderonlineService.php => OrdersService.php}        | 9 ++++-----
 app/JsonRpc/OrdersServiceInterface.php                   | 8 ++++++++
 config/autoload/dependencies.php                         | 2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100644 app/JsonRpc/OrderonlineServiceInterface.php
 rename app/JsonRpc/{OrderonlineService.php => OrdersService.php} (97%)
 create mode 100644 app/JsonRpc/OrdersServiceInterface.php

diff --git a/app/JsonRpc/OrderonlineServiceInterface.php b/app/JsonRpc/OrderonlineServiceInterface.php
deleted file mode 100644
index 3d4a22f..0000000
--- a/app/JsonRpc/OrderonlineServiceInterface.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace App\JsonRpc;
-
-interface OrderonlineServiceInterface
-{
-
-}
\ No newline at end of file
diff --git a/app/JsonRpc/OrderonlineService.php b/app/JsonRpc/OrdersService.php
similarity index 97%
rename from app/JsonRpc/OrderonlineService.php
rename to app/JsonRpc/OrdersService.php
index 87cd638..32d4ef9 100644
--- a/app/JsonRpc/OrderonlineService.php
+++ b/app/JsonRpc/OrdersService.php
@@ -19,13 +19,12 @@ use Hyperf\DbConnection\Db;
 use Hyperf\Guzzle\CoroutineHandler;
 use Hyperf\RpcServer\Annotation\RpcService;
 use Hyperf\Di\Annotation\Inject;
-use App\JsonRpc\OrderonlineServiceInterface as OrderonlineRpcService;
-use function AlibabaCloud\Client\json;
+use App\JsonRpc\OrdersServiceInterface;
 
 /**
- * @RpcService(name="OrderOnlineService", protocol="jsonrpc-http", server="jsonrpc-http", publishTo="")
+ * @RpcService(name="OrdersService", protocol="jsonrpc-http", server="jsonrpc-http", publishTo="")
  */
-class OrderonlineService implements OrderonlineRpcService
+class OrdersService implements OrdersServiceInterface
 {
 
     /**
@@ -76,7 +75,7 @@ class OrderonlineService implements OrderonlineRpcService
         } catch (\Exception $e) {
 
             Db::rollBack();
-            $this->log->event(LogLabel::ORDER_COMPLETE_LOG, ['jsonrpc_order_service_exception_onlineComplete' => $e->getMessage(), 'params' => json([$global_order_id, $user_id])]);
+            $this->log->event(LogLabel::ORDER_COMPLETE_LOG, ['jsonrpc_order_service_exception_onlineComplete' => $e->getMessage(), 'params' => json_encode([$global_order_id, $user_id])]);
             return [
                 "status" => 200,
                 "code" => $e->getCode() ?? ErrorCode::ORDER_COMPLETE_FAIL,
diff --git a/app/JsonRpc/OrdersServiceInterface.php b/app/JsonRpc/OrdersServiceInterface.php
new file mode 100644
index 0000000..0378662
--- /dev/null
+++ b/app/JsonRpc/OrdersServiceInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\JsonRpc;
+
+interface OrdersServiceInterface
+{
+
+}
\ No newline at end of file
diff --git a/config/autoload/dependencies.php b/config/autoload/dependencies.php
index 56db619..1a5a573 100644
--- a/config/autoload/dependencies.php
+++ b/config/autoload/dependencies.php
@@ -38,7 +38,7 @@ return [
     \App\Service\OrderListServiceInterface::class => \App\Service\OrderListService::class,
     \App\Service\StoreServiceInterface::class => \App\Service\StoreService::class,
     \App\JsonRpc\SmsServiceInterface::class => \App\JsonRpc\AlismsService::class,
-    \App\JsonRpc\OrderonlineServiceInterface::class => \App\JsonRpc\OrderonlineService::class,
+    \App\JsonRpc\OrdersServiceInterface::class => \App\JsonRpc\OrdersService::class,
     \App\Service\v3\Interfaces\GoodsServiceInterface::class => \App\Service\v3\Implementations\GoodsService::class,
     \App\Service\v3\Interfaces\SmsSendServiceInterface::class => \App\Service\v3\Implementations\SmsAliSendService::class,
     \App\Service\v3\Interfaces\HelperServiceInterface::class => \App\Service\v3\Implementations\HelperService::class,