From c6614fa66e002966697317e0a0618f574fc60d09 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Mon, 24 Aug 2020 11:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=8C=E6=88=90API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/OrderController.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Controller/OrderController.php b/app/Controller/OrderController.php
index bec90c9..4896c6f 100644
--- a/app/Controller/OrderController.php
+++ b/app/Controller/OrderController.php
@@ -71,12 +71,12 @@ class OrderController extends BaseController
         }
 
         $userId = $this->request->input('user_id');
-        $orderId = $this->request->input('order_id');
-        $orderExist = OrderMain::query()
+        $orderId = $this->request->input('order_id'); // TODO 等新订单列表接口处理完毕后全面转换成global_order_id
+        $orderMain = OrderMain::query()
             ->where(['id' => $orderId, 'state' => OrderMain::ORDER_STATE_DELIVERY, 'user_id' => $userId])
-            ->exists();
+            ->first();
 
-        if (!$orderExist) {
+        if (empty($orderMain)) {
             $this->log->event(LogLabel::ONLINE_COMPLETE_LOG, ['order_not_found' => 'order_not_found']);
             return $this->result(ErrorCode::SEPARATE_ACCOUNTS_ERROR, '', '操作失败，订单异常或不存在');
         }
@@ -84,11 +84,11 @@ class OrderController extends BaseController
         Db::beginTransaction();
         try {
 
-            $this->orderService->onlineCompleted($orderId);
-            $this->separateAccountsService->orderOnlineCompleted($orderId);
+            $this->orderService->onlineCompleted($orderMain->global_order_id);
+            $this->separateAccountsService->orderOnlineCompleted($orderMain->global_order_id);
 
             Db::commit();
-            return $this->success(['order_id' => $orderId]);
+            return $this->success('');
         } catch (\Exception $e) {
 
             Db::rollBack();