|
|
@@ -123,6 +123,7 @@ class TradeService extends BaseService
|
|
|
$counts = $this->counts($params);
|
|
|
|
|
|
// 今日
|
|
|
+ $params['keyword'] = '';
|
|
|
$params['datetime'] = [$curDate,$curDate];
|
|
|
$countToday = $this->counts($params);
|
|
|
|
|
|
@@ -214,6 +215,12 @@ class TradeService extends BaseService
|
|
|
$query->whereIn('a.status', [1, 2, 3]);
|
|
|
}
|
|
|
})
|
|
|
+ ->where(function ($query) use ($params) {
|
|
|
+ $keyword = isset($params['keyword']) ? trim($params['keyword']) : '';
|
|
|
+ if (!empty($keyword)) {
|
|
|
+ $query->where('m.nickname','like',"%{$keyword}%");
|
|
|
+ }
|
|
|
+ })
|
|
|
->select([\DB::raw("sum(money) as total"),'a.change_type'])
|
|
|
->orderBy('a.create_time','desc')
|
|
|
->groupBy('a.change_type')
|