小程序app-订单详情

app/common/repositories/store/order/StoreOrderRepository.php

@@ -2702,9 +2702,9 @@ class StoreOrderRepository extends BaseRepository
         }
         $pay_time = isset($data->pay_time) ?? $data['pay_time'];
         $data['take_order_time'] = strtotime($pay_time) + $time;
-        if ($query->order_type == 1) {
-            $query->append(['take']);
-        }
+//        if ($query->order_type == 1) {
+//            $query->append(['take']);
+//        }
         return $data;
     }
 

app/controller/api/store/order/StoreOrder.php

@@ -959,14 +959,20 @@ class StoreOrder extends BaseController
      */
     public function detail($id)
     {
-        $order = $this->repository->getDetail((int)$id);
+//        $order = $this->repository->getDetail((int)$id);
+        $query = Db::name('store_order')->alias('o')
+            ->leftJoin('store_order_product p', 'p.order_id = o.order_id')
+            ->leftJoin('merchant m', 'm.mer_id = o.mer_id')
+            ->field('o.*, m.mer_name, m.mer_avatar, m.business_id, p.*')
+            ->where('o.order_sn', $id)
+            ->where('o.is_del', 0);
 //        $order = $this->repository->getDetail((int)$id, $this->request->uid());
-        if (!$order)
+        if (!$query)
             return app('json')->fail('订单不存在');
 //        if ($order->order_type == 1) {
 //            $order->append(['take']);
 //        }
-        return app('json')->success($order->toArray());
+        return app('json')->success($query->toArray());
 //        $query = Db::name('store_order')
 //            ->where('order_sn', $id)
 //            ->select()