|
|
@@ -25,16 +25,8 @@ class Bet extends Controller
|
|
|
'id' => ['nullable', 'string'],
|
|
|
'status' => ['nullable', 'integer', 'in:1,2'],
|
|
|
'username' => ['nullable', 'string', 'min:1'],
|
|
|
- 'start_time' => ['required', 'date', 'date_format:Y-m-d', 'required_with:end_time'],
|
|
|
- 'end_time' => ['required', 'date', 'date_format:Y-m-d', 'required_with:start_time',
|
|
|
- function ($attribute, $value, $fail) {
|
|
|
- $startTime = request('start_time');
|
|
|
- if ($startTime) {
|
|
|
- $start = Carbon::parse($startTime);
|
|
|
- $end = Carbon::parse($value);
|
|
|
- if ($end->diffInDays($start) > 30) $fail('最大查找时间跨度：30天');
|
|
|
- }
|
|
|
- }],
|
|
|
+ 'start_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:end_time'],
|
|
|
+ 'end_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:start_time'],
|
|
|
'is_winner' => ['nullable', 'integer', 'in:0,1'],
|
|
|
]);
|
|
|
|
|
|
@@ -52,8 +44,14 @@ class Bet extends Controller
|
|
|
}
|
|
|
|
|
|
$count = $query->count();
|
|
|
- $query1 = clone $query;
|
|
|
- $totalAmount = $query1->sum('amount');
|
|
|
+ $totalAmount = '--';
|
|
|
+ if ((isset($params['member_id']) || isset($params['username'])) && isset($params['start_time'])) {
|
|
|
+ $start = Carbon::parse($params['start_time']);
|
|
|
+ $end = Carbon::parse($params['end_time']);
|
|
|
+ if ($end->diffInDays($start) < 30) $totalAmount = $query->sum('amount');
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
$query->with(['user', 'issue', 'pcIssue'])->orderBy('id', 'desc');
|
|
|
$list = $query->forPage($page, $limit)->get()->toArray();
|
|
|
|
Ken