Skip to content

J
jwhx
Commit 4cb38877 authored by wuxiaoli's avatar wuxiaoli
Browse files
Options

no message

parent c79d50a9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/Member/app/Services/PolymerService.php
View file @ 4cb38877
...@@ -32,7 +32,7 @@ class PolymerService { ...@@ -32,7 +32,7 @@ class PolymerService {
} }
if ($request->filled('is_user')) { if ($request->filled('is_user')) {
$map[] = ['member_id', '=', auth('api')->user()['uid']]; $map[] = ['member_id', '=', auth('api')->user()['uid']];
$query->whereIn('type', ['income', 'withdraw', 'transfer']); $query->whereIn('type', ['income', 'withdraw', 'pay']);
} }
$query->where($map)->orderBy('id', 'desc'); $query->where($map)->orderBy('id', 'desc');
...@@ -55,7 +55,7 @@ class PolymerService { ...@@ -55,7 +55,7 @@ class PolymerService {
$map[] = ['member_id', '=', auth('admin')->user()['uid']]; $map[] = ['member_id', '=', auth('admin')->user()['uid']];
$query->whereIn('type', ['service_income', 'service_withdraw', 'service_transfer']); $query->whereIn('type', ['service_income', 'service_withdraw', 'service_transfer']);
}else{ }else{
$query->whereIn('type', ['income', 'withdraw', 'transfer']); $query->whereIn('type', ['income', 'withdraw', 'pay']);
} }
if ($request->filled('type')) { if ($request->filled('type')) {
if (is_string($request->input('type'))){ if (is_string($request->input('type'))){
...@@ -71,7 +71,7 @@ class PolymerService { ...@@ -71,7 +71,7 @@ class PolymerService {
'total' => $query->count(), 'total' => $query->count(),
'page' => $request->input('page', 1), 'page' => $request->input('page', 1),
'data' => $query->offset($request->input('offset', 0))->limit($request->input('limit', 30))->get()->each(function($item){ 'data' => $query->offset($request->input('offset', 0))->limit($request->input('limit', 30))->get()->each(function($item){
if (in_array($item->type, ['income', 'withdraw'])){ if (in_array($item->type, ['income', 'withdraw','pay'])){
$item->member = $item->member()->select(['uid', 'username', 'nickname', 'avatar'])->first(); $item->member = $item->member()->select(['uid', 'username', 'nickname', 'avatar'])->first();
}else if (in_array($item->type, ['service_income', 'service_withdraw'])){ }else if (in_array($item->type, ['service_income', 'service_withdraw'])){
$item->member = $item->admin()->select(['uid', 'username', 'nickname', 'avatar'])->first(); $item->member = $item->admin()->select(['uid', 'username', 'nickname', 'avatar'])->first();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment