小程序app-订单详情

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

@@ -2672,12 +2672,12 @@ class StoreOrderRepository extends BaseRepository
      * @author xaboy
      * @day 2020/6/10
      */
-    public function getDetail($id, $uid = null)
+    public function getDetail($id)
     {
         $time = systemConfig('auto_take_order_timer') * 24 * 60 * 60;
-
-        $where = [];
-        if ($uid) $where['uid'] = $uid;
+//
+//        $where = [];
+//        if ($uid) $where['uid'] = $uid;
 
 //        $data = $this->dao->search($where)->where('group_order_id', $id)->where('is_del', 0)->with([
 //            'orderProduct', 'merchant' => function ($query) {
@@ -2700,8 +2700,10 @@ class StoreOrderRepository extends BaseRepository
         if (!$data) {
             return null;
         }
-        $pay_time = isset($data->pay_time) ?? $data['pay_time'];
-        $data['take_order_time'] = strtotime($pay_time) + $time;
+//        $pay_time = isset($data->pay_time) ?? $data['pay_time'];
+//        $data['take_order_time'] = strtotime($pay_time) + $time;
+        $pay_time = isset($data['pay_time']) && $data['pay_time'] ? $data['pay_time'] : null;
+        $data['take_order_time'] = $pay_time ? strtotime($pay_time) + $time : null;
 //        if ($query->order_type == 1) {
 //            $query->append(['take']);
 //        }

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

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