小程序app-订单详情

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

@@ -2679,17 +2679,34 @@ 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([
-            'orderProduct', 'merchant' => 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();
+        $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');
-                }
-            ]);
-        })->find();
+        ])
+            ->when(!$uid, function ($query) {
+                $query->with([
+                    'user' => function ($query) {
+                        return $query->field('uid,nickname');
+                    }
+                ]);
+            })
+            ->where('uid', $where['uid'])
+            ->where('group_order_id', $id)
+            ->where('is_del', 0)
+            ->find();
         $pay_time = isset($data->pay_time) ?? $data['pay_time'];
         $data['take_order_time'] = strtotime($pay_time) + $time;
         return $data;
@@ -5272,6 +5289,7 @@ class StoreOrderRepository extends BaseRepository
         $teshu_mer_id = implode(',', $teshu_mer_id);
         $query = $this->dao->search($where)->where('test_order', 0)->where('is_del', 0);
 //        $query = $this->dao->search($where)->where('is_del', 0);
+//        $query = Db::name('store_order')->where('test_order', 0)->where('is_del', 0)->where('uid',$where['uid'])->where('paid',1)->where('status',$where['status']);
         $count = $query->count();
         $list = $query->with([
             'orderProduct', 'merchant' => function ($query) {