|
|
@@ -45,12 +45,17 @@ class Balance extends Controller
|
|
|
{
|
|
|
try {
|
|
|
request()->validate([
|
|
|
- 'member_id' => ['nullable', 'string', 'min:1']
|
|
|
+ 'member_id' => ['nullable', 'string', 'min:1'],
|
|
|
+ 'change_type' => ['nullable', 'string'],
|
|
|
]);
|
|
|
$page = request()->input('page', 1);
|
|
|
$limit = request()->input('limit', 10);
|
|
|
$memberId = request()->input('member_id');
|
|
|
+ $changeType= request()->input('change_type');
|
|
|
$query = BalanceLog::query();
|
|
|
+ if($changeType){
|
|
|
+ $query->where('change_type', $changeType);
|
|
|
+ }
|
|
|
if ($memberId) {
|
|
|
$query->where('member_id', $memberId);
|
|
|
}
|
|
|
@@ -58,9 +63,7 @@ class Balance extends Controller
|
|
|
$data['data'] = $query->orderByDesc('id')
|
|
|
->forPage($page, $limit)->with(['member'])
|
|
|
->get()->toArray();
|
|
|
- $data['change_types'] = BalanceLog::select('change_type')
|
|
|
- ->groupBy('change_type')
|
|
|
- ->get();
|
|
|
+ $data['change_types'] = BalanceLogService::$RW;
|
|
|
|
|
|
|
|
|
} catch (ValidationException $e) {
|