diff --git a/app/Admin/Controllers/StoreUserReportController.php b/app/Admin/Controllers/StoreUserReportController.php index 04c4b30..1cd4711 100644 --- a/app/Admin/Controllers/StoreUserReportController.php +++ b/app/Admin/Controllers/StoreUserReportController.php @@ -34,9 +34,6 @@ class StoreUserReportController extends AdminController return $market->name; }); $grid->store_name; - // $grid->mm_user_id->display(function ($markrtId) { - // return '未关联市场经理'; - // }); $grid->new_user_total; $grid->filter(function (Grid\Filter $filter) { diff --git a/app/Admin/Repositories/StoreUserReport.php b/app/Admin/Repositories/StoreUserReport.php index dd5c1de..0736cc4 100644 --- a/app/Admin/Repositories/StoreUserReport.php +++ b/app/Admin/Repositories/StoreUserReport.php @@ -30,7 +30,7 @@ class StoreUserReport extends EloquentRepository /* 根据流水查询 2020-08-18 目前用全匹配文字方式查询新用户 */ $storeAccountModel = new storeAccountModel(); $query = $storeAccountModel::join('ims_cjdc_store as store','ims_cjdc_store_account.store_id','store.id') - ->select('store_id','store.market_id','store.name as store_name','mm_user_id',DB::raw("count(distinct ims_cjdc_store_account.id) as new_user_total")) + ->select('store_id','store.market_id','store.name as store_name',DB::raw("count(distinct ims_cjdc_store_account.id) as new_user_total")) ->whereRaw("note = '新用户下单成功,平台奖励'") ->groupBy('store_id') ->orderBy('store.market_id','desc')