|
@@ -7,6 +7,7 @@
|
7
|
7
|
*/
|
8
|
8
|
namespace App\Http\Controllers\Admin;
|
9
|
9
|
use App\CustomerCoupons;
|
|
10
|
+use App\CustomerGiftReceives;
|
10
|
11
|
use App\CustomerMonthGift;
|
11
|
12
|
use App\CustomerVip;
|
12
|
13
|
use App\Goods;
|
|
@@ -393,6 +394,10 @@ class CustomerDepositController extends Controller
|
393
|
394
|
if( !empty($saler_ids) ) $query->whereIn('admin_id', $saler_ids);
|
394
|
395
|
})->orderBy('id','desc')->offset($offset)->limit($pageSize)->get();
|
395
|
396
|
$result = json_decode(json_encode($result),true);
|
|
397
|
+ foreach($result as &$value) {
|
|
398
|
+ $admin = Admin::find($value['admin_id']);
|
|
399
|
+ $value['admin_name'] = $admin->realname;
|
|
400
|
+ }
|
396
|
401
|
|
397
|
402
|
|
398
|
403
|
$teamList = DB::table('teams')->select('id', 'name')->where(function($query) use($team_id, $self_role){
|