团队灵活配置

app/Console/Commands/DayGrandTeamTotal.php

@@ -6,6 +6,7 @@ use DB;
 use App\CustTotal;
 use App\CustDetail;
 use App\Order;
+use App\Admin;
 class DayGrandTeamTotal extends Command {
 
     protected $signature = 'DayGrandTeamTotal';
@@ -35,9 +36,9 @@ class DayGrandTeamTotal extends Command {
             echo "\n日期：".$idate." 已存在";
             return false;
         }
-        $team_ids = [1,3,5];
+        $team_ids = Admin::getTeams();
         //获取各个团队销售id
-        $salerIds = $this->getTeamSalers();
+        $salerIds = $this->getTeamSalers($team_ids);
         foreach($team_ids as $team_id){
             //获取团队销售
             $saler_ids = $salerIds[$team_id];
@@ -97,11 +98,11 @@ class DayGrandTeamTotal extends Command {
         }
     }
 
-    public function getTeamSalers(){
+    public function getTeamSalers($team_ids){
         $data = array();
-        $data[1] = DB::table('admin')->where('team_id', 1)->lists('id');
-        $data[3] = DB::table('admin')->where('team_id', 3)->lists('id');
-        $data[5] = DB::table('admin')->where('team_id', 5)->lists('id');
+        foreach($team_ids as $team_id){
+            $data[$team_id] = DB::table('admin')->where('team_id', $team_id)->lists('id');
+        }
         return $data;
     }
 

app/Console/Commands/DayGrandTeamTotalHistory.php

@@ -6,6 +6,7 @@ use DB;
 use App\CustTotal;
 use App\CustDetail;
 use App\Order;
+use App\Admin;
 class DayGrandTeamTotalHistory extends Command {
 
     protected $signature = 'DayGrandTeamTotalHistory';
@@ -37,9 +38,9 @@ class DayGrandTeamTotalHistory extends Command {
                 echo "\n日期：".$idate." 已存在";
                 return false;
             }
-            $team_ids = [1,3,5];
+            $team_ids = Admin::getTeams();
             //获取各个团队销售id
-            $salerIds = $this->getTeamSalers();
+            $salerIds = $this->getTeamSalers($team_ids);
             foreach($team_ids as $team_id){
                 //获取团队销售
                 $saler_ids = $salerIds[$team_id];
@@ -105,11 +106,11 @@ class DayGrandTeamTotalHistory extends Command {
         }
     }
 
-    public function getTeamSalers(){
+    public function getTeamSalers($team_ids){
         $data = array();
-        $data[1] = DB::table('admin')->where('team_id', 1)->lists('id');
-        $data[3] = DB::table('admin')->where('team_id', 3)->lists('id');
-        $data[5] = DB::table('admin')->where('team_id', 5)->lists('id');
+        foreach($team_ids as $team_id){
+            $data[$team_id] = DB::table('admin')->where('team_id', $team_id)->lists('id');
+        }
         return $data;
     }
 

app/Console/Commands/RoiTeamTotal.php

@@ -5,6 +5,7 @@ use Illuminate\Console\Command;
 use DB;
 use App\CustTotal;
 use App\CustDetail;
+use App\Admin;
 class RoiTeamTotal extends Command {
 
     protected $signature = 'RoiTeamTotal';
@@ -30,12 +31,13 @@ class RoiTeamTotal extends Command {
             5 => '-60 day',
         );
         //获取各个团队销售id
-        $salerIds = $this->getTeamSalers();
+        $team_ids = Admin::getTeams();
+        $salerIds = $this->getTeamSalers($team_ids);
         for($i=1;$i<6;$i++){
             $stime = date('Y-m-d', strtotime($timeArr[$i]));   
             $etime = $date = date('Y-m-d');
             //计算date i天内的roi    
-            $result = CustTotal::select(DB::raw('sum(total_cost) as total_cost, sum(total_fan_add) as total_fan_add, team_id'))->whereIn('team_id', [1,3,5])->where('is_del',0)->where('dtime', $stime)->groupBy('team_id')->get();
+            $result = CustTotal::select(DB::raw('sum(total_cost) as total_cost, sum(total_fan_add) as total_fan_add, team_id'))->whereIn('team_id', $team_ids)->where('is_del',0)->where('dtime', $stime)->groupBy('team_id')->get();
 
             $result = json_decode(json_encode($result), true);           
             
@@ -83,11 +85,11 @@ class RoiTeamTotal extends Command {
         return DB::table('roi_team_total')->insert($data);
     }
 
-    public function getTeamSalers(){
+    public function getTeamSalers($team_ids){
         $data = array();
-        $data[1] = DB::table('admin')->where('team_id', 1)->lists('id');
-        $data[3] = DB::table('admin')->where('team_id', 3)->lists('id');
-        $data[5] = DB::table('admin')->where('team_id', 5)->lists('id');
+        foreach($team_ids as $team_id){
+            $data[$team_id] = DB::table('admin')->where('team_id', $team_id)->lists('id');
+        }
         return $data;
     }
 

app/Console/Commands/RoiTeamTotalHistory.php

@@ -5,6 +5,7 @@ use Illuminate\Console\Command;
 use DB;
 use App\CustTotal;
 use App\CustDetail;
+use App\Admin;
 class RoiTeamTotalHistory extends Command {
 
     protected $signature = 'RoiTeamTotalHistory';
@@ -30,7 +31,8 @@ class RoiTeamTotalHistory extends Command {
             5 => '60',
         );
         //获取各个团队销售id
-        $salerIds = $this->getTeamSalers();
+        $team_ids = Admin::getTeams();
+        $salerIds = $this->getTeamSalers($team_ids);
         for($i=1;$i<6;$i++){
             $j_min = $timeArr[$i];
             for($j=69; $j>=$j_min; $j--){
@@ -39,7 +41,7 @@ class RoiTeamTotalHistory extends Command {
                 $etime = $date = date('Y-m-d', strtotime('-'.$e.' day'));
 
                //计算date i天内的roi    
-                $result = CustTotal::select(DB::raw('sum(total_cost) as total_cost, sum(total_fan_add) as total_fan_add, team_id'))->whereIn('team_id', [1,3,5])->where('is_del',0)->where('dtime', $stime)->groupBy('team_id')->get();
+                $result = CustTotal::select(DB::raw('sum(total_cost) as total_cost, sum(total_fan_add) as total_fan_add, team_id'))->whereIn('team_id', $team_ids)->where('is_del',0)->where('dtime', $stime)->groupBy('team_id')->get();
 
                 $result = json_decode(json_encode($result), true);           
                 foreach($result as $k=>$v){
@@ -87,11 +89,11 @@ class RoiTeamTotalHistory extends Command {
         return DB::table('roi_team_total')->insert($data);
     }
 
-    public function getTeamSalers(){
+    public function getTeamSalers($team_ids){
         $data = array();
-        $data[1] = DB::table('admin')->where('team_id', 1)->lists('id');
-        $data[3] = DB::table('admin')->where('team_id', 3)->lists('id');
-        $data[5] = DB::table('admin')->where('team_id', 5)->lists('id');
+        foreach($team_ids as $team_id){
+            $data[$team_id] = DB::table('admin')->where('team_id', $team_id)->lists('id');
+        }
         return $data;
     }
 

app/Console/Commands/TeamOrderRateByDay.php

@@ -3,6 +3,7 @@ namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
 use DB;
+use App\Admin;
 class TeamOrderRateByDay extends Command {
 
     protected $signature = 'TeamOrderRateByDay';
@@ -20,7 +21,7 @@ class TeamOrderRateByDay extends Command {
         $this->TeamOrderRateByDay();
     }
     public function TeamOrderRateByDay(){
-        $team_ids = [1,3,5];
+        $team_ids = Admin::getTeams();
         foreach($team_ids as $team_id){
             #团队成员：
             $saler_ids = DB::table('admin')->where('team_id', $team_id)->lists('id');

app/Console/Commands/TeamOrderRateByDayHistory.php

@@ -3,6 +3,7 @@ namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
 use DB;
+use App\Admin;
 class TeamOrderRateByDayHistory extends Command {
 
     protected $signature = 'TeamOrderRateByDayHistory';
@@ -20,7 +21,7 @@ class TeamOrderRateByDayHistory extends Command {
         $this->TeamOrderRateByDayHistory();
     }
     public function TeamOrderRateByDayHistory(){
-        $team_ids = [1,3,5];
+        $team_ids = Admin::getTeams();
         foreach($team_ids as $team_id){
             #团队成员：
             $saler_ids = DB::table('admin')->where('team_id', $team_id)->lists('id');

app/Http/Controllers/Admin/CustReportController.php

@@ -739,8 +739,9 @@ class custReportController extends Controller
         //销售名字
         $salers = DB::table('admin')->whereIn('id', $ids)->lists('realname', 'id');
  
+        $stime = date('Y-m-d', strtotime('-15 day'));
         //查每日上报数据销售
-        $result = DB::table('cust_day_detail')->select('admin_id', 'dtime')->where('dtime','<',$today)->where('dtime','>=','2019-09-04')->where('is_del', 0)->orderBy('dtime', 'desc')->get();
+        $result = DB::table('cust_day_detail')->select('admin_id', 'dtime')->where('dtime','<',$today)->where('dtime','>=',$stime)->where('is_del', 0)->orderBy('dtime', 'desc')->get();
         $result = json_decode(json_encode($result), true);
 
         $data = array();

app/Http/Controllers/Admin/StatisticsController.php

@@ -3516,7 +3516,7 @@ class StatisticsController extends Controller
         if($etime && $etime<$edate){
             $edate = $etime;
         }
-        $teams = [1,3,5];
+        $teams = Admin::getTeams();
         if($team_id>0){
             $teams = [$team_id];
         }
@@ -4398,12 +4398,13 @@ class StatisticsController extends Controller
 
         //假如有团队筛选，检索销售队员
         $saler_ids = null;
+        $team_ids = Admin::getTeams();
         if($saler_id>0){
             $saler_ids = [$saler_id];
         }elseif($team_id>0){
             $saler_ids = DB::table('admin')->where('team_id', $team_id)->lists('id');
         }else{
-            $saler_ids = DB::table('admin')->whereIn('team_id', [1,3,5])->lists('id');
+            $saler_ids = DB::table('admin')->whereIn('team_id', $team_ids)->lists('id');
         }
 
         $page = (int)$request->input('page');
@@ -4519,12 +4520,13 @@ class StatisticsController extends Controller
 
         //假如有团队筛选，检索销售队员
         $saler_ids = null;
+        $team_ids = Admin::getTeams();
         if($saler_id>0){
             $saler_ids = [$saler_id];
         }elseif($team_id>0){
             $saler_ids = DB::table('admin')->where('team_id', $team_id)->lists('id');
         }else{
-            $saler_ids = DB::table('admin')->whereIn('team_id', [1,3,5])->lists('id');
+            $saler_ids = DB::table('admin')->whereIn('team_id', $team_ids)->lists('id');
         }
 
         //销售名字
@@ -4838,11 +4840,7 @@ class StatisticsController extends Controller
             if($stime) $query->where('idate', '>=', $stime);
             if($etime) $query->where('idate', '<=', $etime);
         })->count();
-        $teamArr = array(
-            1 => '北京销售团队',
-            3 => '济南销售团队',
-            5 => '杭州雷霆团队',
-        );
+        $teamArr = Admin::getTeamsName();
         $result = DB::table('day_grand_team_total')->where(function($query) use($team_id, $stime, $etime){
             if($team_id) $query->where('team_id', $team_id);
             if($stime) $query->where('idate', '>=', $stime);
@@ -4889,11 +4887,7 @@ class StatisticsController extends Controller
         $stime = $request->input('stime');
         $etime = $request->input('etime');
        
-        $teamArr = array(
-            1 => '北京销售团队',
-            3 => '济南销售团队',
-            5 => '杭州雷霆团队',
-        );
+        $teamArr = Admin::getTeamsName();
         $result = DB::table('day_grand_team_total')->where(function($query) use($team_id, $stime, $etime){
             if($team_id) $query->where('team_id', $team_id);
             if($stime) $query->where('idate', '>=', $stime);