From 0b22496da61eae8900bc7987127eab2209512467 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Fri, 25 Sep 2020 16:57:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/Salesman.php | 52 +++++++++++++++++--------- app/Admin/Repositories/v3/Salesman.php | 41 -------------------- app/Http/Controllers/Salesman.php | 20 ++++++++-- 3 files changed, 52 insertions(+), 61 deletions(-) diff --git a/app/Admin/Controllers/v3/Salesman.php b/app/Admin/Controllers/v3/Salesman.php index ac554da..35078c7 100644 --- a/app/Admin/Controllers/v3/Salesman.php +++ b/app/Admin/Controllers/v3/Salesman.php @@ -12,23 +12,41 @@ class Salesman extends AdminController { protected function grid() { - return Grid::make(new SalesmanData(),function (Grid $grid){ - $grid->paginate(10); - $grid->column('person_id','懒ID'); - $grid->column('nick_name','拓展员'); - $grid->column('total','社区总数'); - $grid->column('t_num','今日订单数'); - $grid->column('t_amount','今日成交额'); - $grid->column('y_num','昨日订单数'); - $grid->column('y_amount','昨日成交额'); - $grid->column('w_num','本周订单数'); - $grid->column('w_amount','本周成交额'); - $grid->column('m_num','本月订单数'); - $grid->column('m_amount','本月成交额'); - $grid->disableActions(); - $grid->filter(function (Grid\Filter $filter){ - $filter->equal('person_id','拓展员懒ID'); + if (false){ + return Grid::make(new SalesmanData(),function (Grid $grid){ + $grid->paginate(10); + $grid->column('person_id','懒ID'); + $grid->column('nick_name','拓展员'); + $grid->column('total','社区总数'); + $grid->column('t_num','今日订单数'); + $grid->column('t_amount','今日成交额'); + $grid->column('y_num','昨日订单数'); + $grid->column('y_amount','昨日成交额'); + $grid->column('w_num','本周订单数'); + $grid->column('w_amount','本周成交额'); + $grid->column('m_num','本月订单数'); + $grid->column('m_amount','本月成交额'); + $grid->disableActions(); + $grid->filter(function (Grid\Filter $filter){ + $filter->equal('person_id','拓展员懒ID'); + }); }); - }); + }else{ + return Grid::make(new \App\Admin\Repositories\v3\Salesman(),function (Grid $grid){ + + + $grid->paginate(10); + $grid->column('person_id','懒ID'); + $grid->column('nick_name','拓展员'); + $grid->column('total','社区总数'); + $grid->column('t_num','今日订单数'); + $grid->column('t_amount','今日成交额'); + $grid->disableActions(); + $grid->filter(function (Grid\Filter $filter){ + $filter->equal('person_id','拓展员懒ID'); + }); + }); + } + } } diff --git a/app/Admin/Repositories/v3/Salesman.php b/app/Admin/Repositories/v3/Salesman.php index 6666f97..7fad51d 100644 --- a/app/Admin/Repositories/v3/Salesman.php +++ b/app/Admin/Repositories/v3/Salesman.php @@ -31,7 +31,6 @@ class Salesman extends EloquentRepository } //>>1.获取业务员 $rows = $build->paginate(10)->toArray(); - //>>2.获取业务员下的所有社区的绑定用户 foreach ($rows['data'] as &$value){ $value['admin_user_id'] = array_unique(explode(',',$value['admin_user_id'])); @@ -53,46 +52,6 @@ class Salesman extends EloquentRepository 'user_ids'=>$uid?$uid:null ],1);//今日订单金额 - $value['y_num'] = Order::getOrderData([ - 'user_type'=>'lanzu_biz',//谁取数据 user_type 用户类型 - 'data_type'=>'number',//取什么数据 data_type 数据类型 - 'market_id'=>'',//取哪个市场数据 - 'condition'=>1,//取数据维度 condition - 'user_ids'=>$uid?$uid:null - ],-1);//昨日订单数 - - $value['y_amount'] = Order::getOrderData([ - 'user_type'=>'lanzu_biz',//谁取数据 user_type 用户类型 - 'data_type'=>'amount',//取什么数据 data_type 数据类型 - 'market_id'=>'',//取哪个市场数据 - 'condition'=>1,//取数据维度 condition - 'user_ids'=>$uid?$uid:null - ],-1);//昨日订单金额 - - $value['w_num'] = Order::getOrderData([ - 'user_type'=>'lanzu_biz',//谁取数据 user_type 用户类型 - 'data_type'=>'number',//取什么数据 data_type 数据类型 - 'market_id'=>'',//取哪个市场数据 - 'condition'=>1,//取数据维度 condition - 'user_ids'=>$uid?$uid:null - ],'w');//本周订单 数 - - $value['w_amount'] = Order::getOrderData([ - 'user_type'=>'lanzu_biz',//谁取数据 user_type 用户类型 - 'data_type'=>'amount',//取什么数据 data_type 数据类型 - 'market_id'=>'',//取哪个市场数据 - 'condition'=>1,//取数据维度 condition - 'user_ids'=>$uid?$uid:null - ],'w');//本周订单金额 - - $value['m_num'] = Order::getOrderData([ - 'user_type'=>'lanzu_biz',//谁取数据 user_type 用户类型 - 'data_type'=>'number',//取什么数据 data_type 数据类型 - 'market_id'=>'',//取哪个市场数据 - 'condition'=>1,//取数据维度 condition - 'user_ids'=>$uid?$uid:null - ],'30');//本月订单数 - $value['m_amount'] = Order::getOrderData([ 'user_type'=>'lanzu_biz',//谁取数据 user_type 用户类型 'data_type'=>'amount',//取什么数据 data_type 数据类型 diff --git a/app/Http/Controllers/Salesman.php b/app/Http/Controllers/Salesman.php index 36856a8..51071c3 100644 --- a/app/Http/Controllers/Salesman.php +++ b/app/Http/Controllers/Salesman.php @@ -6,11 +6,13 @@ namespace App\Http\Controllers; use App\Admin\Common\Order; use App\Models\LanzuCsInfo; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; class Salesman extends \Illuminate\Routing\Controller { public function addData() { + set_time_limit(0); $rows = LanzuCsInfo::select( DB::raw('count("lanzu_cs_info.person_id") as total'), DB::raw('group_concat(lanzu_cs_info.admin_user_id) as admin_user_id'), @@ -20,7 +22,6 @@ class Salesman extends \Illuminate\Routing\Controller ->leftJoin('lanzu_user','lanzu_user.id','lanzu_cs_info.person_id') ->leftJoin('lanzu_user_relation_bind as rb','rb.source_id','lanzu_cs_info.admin_user_id') ->where('lanzu_cs_info.person_id','>',0)->get()->toArray(); - foreach ($rows as &$value){ $value['admin_user_id'] = array_unique(explode(',',$value['admin_user_id'])); $value['total'] = count($value['admin_user_id']); @@ -91,7 +92,20 @@ class Salesman extends \Illuminate\Routing\Controller unset($value['admin_user_id']); unset($value['user_id']); } - DB::table('lanzu_salesman_data')->delete(); - return DB::table('lanzu_salesman_data')->insert($rows); + + DB::beginTransaction(); + try { + DB::table('lanzu_salesman_data')->delete(); + $result = DB::table('lanzu_salesman_data')->insert($rows); + if ($result){ + echo 'success'; + }else{ + echo 'fail'; + } + DB::commit(); + }catch (\Exception $e){ + Log::debug('社区拓展员数据添加失败',[$e->getMessage()]); + DB::rollBack(); + } } }