小程序app-订单详情

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

@@ -2676,32 +2676,35 @@ class StoreOrderRepository extends BaseRepository
     {
         $time = systemConfig('auto_take_order_timer') * 24 * 60 * 60;
 //
-//        $where = [];
+        $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) {
-//                return $query->field('mer_id,mer_name,mer_avatar,business_id');
-//            }
-//        ])->when(!$uid, function ($query) {
+        $data = $this->dao->search($where)->where('group_order_id', $id)->where('is_del', 0)->with([
+            'orderProduct', 'merchant' => function ($query) {
+                return $query->field('mer_id,mer_name,mer_avatar,business_id');
+            }
+        ])
+//            ->when(!$uid, function ($query) {
 //            $query->with([
 //                'user' => function ($query) {
 //                    return $query->field('uid,nickname');
 //                }
 //            ]);
-//        })->find();
-        $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);
-        $data = $query->find();
-        if (!$data) {
-            return null;
-        }
+//        })
+            ->find();
+//        $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);
+//        $data = $query->find();
+//        if (!$data) {
+//            return null;
+//        }
 //        $pay_time = isset($data->pay_time) ?? $data['pay_time'];
 //        $data['take_order_time'] = strtotime($pay_time) + $time;
+        $data = $data ? $data->toArray() : null;
         $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) {