wesmiler 抢表商城

app/Services/Common/TradeService.php

@@ -109,7 +109,10 @@ class TradeService extends BaseService
             ->where(function ($query) use ($params) {
                 $keyword = isset($params['keyword']) ? $params['keyword'] : '';
                 if ($keyword) {
-                    $query->where('b.nickname', 'like', "%{$keyword}%")->orWhere('b.mobile', 'like', "%{$keyword}%")->orWhere('g.goods_name', 'like', "%{$keyword}%");
+                    $query->where('b.nickname', 'like', "%{$keyword}%")->orWhere('b.mobile', 'like', "%{$keyword}%")
+                        ->orWhere('s.name', 'like', "%{$keyword}%")
+                        ->orWhere('s.code', 'like', "%{$keyword}%")
+                        ->orWhere('g.goods_name', 'like', "%{$keyword}%");
                 }
             })
             ->where(function ($query) use ($params) {
@@ -149,6 +152,7 @@ class TradeService extends BaseService
                 }*/
             })
             ->select(['a.*', 'b.nickname', 'b.mobile as buy_mobile','s.name as shop_name','s.code as shop_code', 'c.nickname as sell_nickname', 'c.mobile as sell_mobile', 'g.goods_name', 'g.code', 'g.thumb'])
+            ->orderBy('s.id', 'asc')
             ->orderBy('a.create_time', 'desc')
             ->orderBy('a.id', 'desc');