Merge pull request '订单详情接口支持商家查询' (#240) from dev into main

Reviewed-on: #240

app/api/controller/order/OrderController.php

@@ -339,10 +339,17 @@ class OrderController extends BaseApiController
     public function detail()
     {
         $order_id = (int)$this->request->get('order_id');
-        $where = [
-            'id' => $order_id,
-            'uid' => $this->userId,
-        ];
+        $is_mer=$this->request->get('is_mer');
+        if($is_mer==1){
+            $where = [
+                'id' => $order_id,
+            ];
+        }else{
+            $where = [
+                'id' => $order_id,
+                'uid' => $this->userId,
+            ];
+        }
         $url = 'https://' . $this->request->host(true);
         $order = OrderLogic::detail($where, $url);
         if ($order) {