小程序app-订单详情

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

@@ -2690,22 +2690,16 @@ class StoreOrderRepository extends BaseRepository
 //                }
 //            ]);
 //        })->find();
-        $data = StoreOrder::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');
-                    }
-                ]);
-            }) //
-            ->where('order_sn', $id)
-            ->where('is_del', 0)
-            ->find();
+        $query = Db::name('store_order')->alias('o')
+            ->leftJoin('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;
         return $data;