Merge branch 'dev-xpy' into dev

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

@@ -2679,7 +2679,7 @@ class StoreOrderRepository extends BaseRepository
         $where = [];
         if ($uid) $where['uid'] = $uid;
 
-        $data = $this->dao->search($where)->where('group_order_id', $id)->where('is_del', 0)->with([
+        $data = $this->dao->search($where)->where('order_sn', $id)->where('is_del', 0)->with([
             'orderProduct', 'merchant' => function ($query) {
                 return $query->field('mer_id,mer_name,mer_avatar,business_id');
             }

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

@@ -959,19 +959,19 @@ class StoreOrder extends BaseController
      */
     public function detail($id)
     {
-//        $order = $this->repository->getDetail((int)$id);
-////        $order = $this->repository->getDetail((int)$id, $this->request->uid());
-//        if (!$order)
-//            return app('json')->fail('订单不存在');
-//        if ($order->order_type == 1) {
-//            $order->append(['take']);
-//        }
-//        return app('json')->success($order->toArray());
-        $query = Db::name('store_order')
-            ->where('order_sn', $id)
-            ->select()
-            ->toArray();
-        return app('json')->success($query, '获取成功');
+        $order = $this->repository->getDetail((int)$id);
+//        $order = $this->repository->getDetail((int)$id, $this->request->uid());
+        if (!$order)
+            return app('json')->fail('订单不存在');
+        if ($order->order_type == 1) {
+            $order->append(['take']);
+        }
+        return app('json')->success($order->toArray());
+//        $query = Db::name('store_order')
+//            ->where('order_sn', $id)
+//            ->select()
+//            ->toArray();
+//        return app('json')->success($query, '获取成功');
     }
 
     /**