Wesmiler

app/Http/Controllers/Api/v1/OrderController.php

@@ -68,10 +68,12 @@ class OrderController extends webApp
         }
 
         $id = isset($params['id']) ? intval($params['id']) : 0;
-        if ($id <= 0) {
+        $no = isset($params['order_no']) ? trim($params['order_no']) : '';
+        if ($id <= 0 && empty($no)) {
             return showJson(1036, false);
         }
-        $data = OrderService::make()->getOrderInfo($id);
+
+        $data = OrderService::make()->getOrderInfo($id,$no);
         if (empty($data)) {
             return showJson(1009, false);
         }

app/Services/Api/OrderService.php

@@ -141,12 +141,18 @@ class OrderService extends BaseService
      * 订单详情
      * @param $id
      */
-    public function getOrderInfo($id)
+    public function getOrderInfo($id, $no='')
     {
+        $where = ['order_no'=>$no,'a.id' => $id, 'a.mark' => 1];
+        if($no){
+            unset($where['id']);
+        }else{
+            unset($where['no']);
+        }
         $statusArr = [1 => '待支付', 2 => '待发货', 3 => '待收货', 4 => '已完成'];
         $info = $this->model->from('orders as a')->with(['orderGoods','store'])
             ->leftJoin('member as b', 'b.id', '=', 'a.user_id')
-            ->where(['a.id' => $id, 'a.mark' => 1])
+            ->where($where)
             ->select(['a.*'])
             ->first();