|
|
@@ -5070,7 +5070,7 @@ class StoreOrderRepository extends BaseRepository
|
|
5070
|
5070
|
// $query = $this->dao->search($where)->where('is_del', 0);
|
|
5071
|
5071
|
$count = $query->count();
|
|
5072
|
5072
|
$list = $query->with([
|
|
5073
|
|
- 'groupOrder', 'orderProduct', 'merchant' => function ($query) {
|
|
|
5073
|
+ 'orderProduct', 'merchant' => function ($query) {
|
|
5074
|
5074
|
return $query->field('mer_id,mer_name,mer_avatar');
|
|
5075
|
5075
|
}
|
|
5076
|
5076
|
])->page($page, $limit)->order('pay_time DESC')->select();
|