From d0429729edeecfb8338f943502891ae7bb75f92b Mon Sep 17 00:00:00 2001
From: xindan <2499232802@qq.com>
Date: Sun, 10 Oct 2021 23:35:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=84=E8=AE=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=94=E8=BF=98=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Order.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/api/controller/Order.php b/app/api/controller/Order.php
index 83f840552..568e5b201 100755
--- a/app/api/controller/Order.php
+++ b/app/api/controller/Order.php
@@ -161,10 +161,8 @@ class Order extends Common
         {
             $ret = DataReturn('参数有误', -1);
         } else {
-            // 条件
-            $where = OrderService::OrderListWhere($params);
-
             // 获取列表
+            $where = OrderService::OrderListWhere($params);
             $data_params = [
                 'm'         => 0,
                 'n'         => 1,
@@ -176,14 +174,14 @@ class Order extends Common
                 // 是否已评论
                 if($data['data'][0]['user_is_comments'] > 0)
                 {
-                    $ret = ApiService::ApiDataReturn(DataReturn('你已进行过评论', -100));
+                    $ret = DataReturn('你已进行过评论', -100);
                 } else {
                     // 返回数据
                     $result = [
                         'data'                  => $data['data'][0],
                         'editor_path_type'      => ResourcesService::EditorPathTypeValue('order_comments-'.$this->user['id'].'-'.$data['data'][0]['id']),
                     ];
-                    $ret = SystemBaseService::DataReturn($result);
+                    $ret = DataReturn('你已进行过评论', 0, $result);
                 }
             } else {
                 $ret = DataReturn('没有相关数据', -100);