汇总历史数据冲泡

app/Console/Commands/DayGrandSalerTotalHistory.php

@@ -77,33 +77,33 @@ class DayGrandSalerTotalHistory extends Command {
                     //7 - 60 roi汇总
                     $s7 = $idate. ' -7 day';
                     $date = date('Y-m-d', strtotime($s7));
-                    $data['cost7'] = DB::table('roi_saler_total')->where('type', 1)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('cost');
-                    $data['order_count7'] = DB::table('roi_saler_total')->where('type', 1)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('order_count');
-                    $data['order_amount7'] = DB::table('roi_saler_total')->where('type', 1)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('order_amount');
+                    $data['cost7'] = DB::table('roi_saler_total')->where('type', 1)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('cost');
+                    $data['order_count7'] = DB::table('roi_saler_total')->where('type', 1)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('order_count');
+                    $data['order_amount7'] = DB::table('roi_saler_total')->where('type', 1)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('order_amount');
 
                     $s15 = $idate. ' -15 day';
                     $date = date('Y-m-d', strtotime($s15));
-                    $data['cost15'] = DB::table('roi_saler_total')->where('type', 2)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('cost');
-                    $data['order_count15'] = DB::table('roi_saler_total')->where('type', 2)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('order_count');
-                    $data['order_amount15'] = DB::table('roi_saler_total')->where('type', 2)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('order_amount');
+                    $data['cost15'] = DB::table('roi_saler_total')->where('type', 2)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('cost');
+                    $data['order_count15'] = DB::table('roi_saler_total')->where('type', 2)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('order_count');
+                    $data['order_amount15'] = DB::table('roi_saler_total')->where('type', 2)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('order_amount');
 
                     $s30 = $idate. ' -30 day';
                     $date = date('Y-m-d', strtotime($s30));
-                    $data['cost30'] = DB::table('roi_saler_total')->where('type', 3)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('cost');
-                    $data['order_count30'] = DB::table('roi_saler_total')->where('type', 3)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('order_count');
-                    $data['order_amount30'] = DB::table('roi_saler_total')->where('type', 3)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('order_amount');
+                    $data['cost30'] = DB::table('roi_saler_total')->where('type', 3)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('cost');
+                    $data['order_count30'] = DB::table('roi_saler_total')->where('type', 3)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('order_count');
+                    $data['order_amount30'] = DB::table('roi_saler_total')->where('type', 3)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('order_amount');
 
                     $s45 = $idate. ' -45 day';
                     $date = date('Y-m-d', strtotime($s45));
-                    $data['cost45'] = DB::table('roi_saler_total')->where('type', 4)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('cost');
-                    $data['order_count45'] = DB::table('roi_saler_total')->where('type', 4)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('order_count');
-                    $data['order_amount45'] = DB::table('roi_saler_total')->where('type', 4)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('order_amount');
+                    $data['cost45'] = DB::table('roi_saler_total')->where('type', 4)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('cost');
+                    $data['order_count45'] = DB::table('roi_saler_total')->where('type', 4)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('order_count');
+                    $data['order_amount45'] = DB::table('roi_saler_total')->where('type', 4)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('order_amount');
 
                     $s60 = $idate. ' -60 day';
                     $date = date('Y-m-d', strtotime($s60));
-                    $data['cost60'] = DB::table('roi_saler_total')->where('type', 5)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('cost');
-                    $data['order_count60'] = DB::table('roi_saler_total')->where('type', 5)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('order_count');
-                    $data['order_amount60'] = DB::table('roi_saler_total')->where('type', 5)->where('admin_id', $admin_id)->where('ad_time', '<', $date)->sum('order_amount');
+                    $data['cost60'] = DB::table('roi_saler_total')->where('type', 5)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('cost');
+                    $data['order_count60'] = DB::table('roi_saler_total')->where('type', 5)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('order_count');
+                    $data['order_amount60'] = DB::table('roi_saler_total')->where('type', 5)->where('admin_id', $admin_id)->where('ad_time', '<=', $date)->sum('order_amount');
                     $res = DB::table('day_grand_saler_total')->insert($data);
                     echo "\n日期：".$idate." 团队：".$team_id. " 销售：" .$admin_id." 插入结果：".$res;
                 }

app/Console/Commands/DayGrandTeamTotalHistory.php

@@ -27,7 +27,7 @@ class DayGrandTeamTotalHistory extends Command {
     
     public function dayGrandTeamTotal(){
         $_start = '2019-09-04';
-        for($i=69;$i>=1;$i--){
+        for($i=79;$i>=1;$i--){
             $m = '-'.($i-1).' day';
             $n = '-'.$i.' day';
             $_end = date('Y-m-d', strtotime($m));
@@ -73,33 +73,33 @@ class DayGrandTeamTotalHistory extends Command {
                 //7 - 60 roi汇总
                 $s7 = $idate. ' -7 day';
                 $date = date('Y-m-d', strtotime($s7));
-                $data['cost7'] = DB::table('roi_team_total')->where('type', 1)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('cost');
-                $data['order_count7'] = DB::table('roi_team_total')->where('type', 1)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('order_count');
-                $data['order_amount7'] = DB::table('roi_team_total')->where('type', 1)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('order_amount');
+                $data['cost7'] = DB::table('roi_team_total')->where('type', 1)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('cost');
+                $data['order_count7'] = DB::table('roi_team_total')->where('type', 1)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('order_count');
+                $data['order_amount7'] = DB::table('roi_team_total')->where('type', 1)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('order_amount');
 
                 $s15 = $idate. ' -15 day';
                 $date = date('Y-m-d', strtotime($s15));
-                $data['cost15'] = DB::table('roi_team_total')->where('type', 2)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('cost');
-                $data['order_count15'] = DB::table('roi_team_total')->where('type', 2)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('order_count');
-                $data['order_amount15'] = DB::table('roi_team_total')->where('type', 2)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('order_amount');
+                $data['cost15'] = DB::table('roi_team_total')->where('type', 2)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('cost');
+                $data['order_count15'] = DB::table('roi_team_total')->where('type', 2)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('order_count');
+                $data['order_amount15'] = DB::table('roi_team_total')->where('type', 2)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('order_amount');
 
                 $s30 = $idate. ' -30 day';
                 $date = date('Y-m-d', strtotime($s30));
-                $data['cost30'] = DB::table('roi_team_total')->where('type', 3)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('cost');
-                $data['order_count30'] = DB::table('roi_team_total')->where('type', 3)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('order_count');
-                $data['order_amount30'] = DB::table('roi_team_total')->where('type', 3)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('order_amount');
+                $data['cost30'] = DB::table('roi_team_total')->where('type', 3)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('cost');
+                $data['order_count30'] = DB::table('roi_team_total')->where('type', 3)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('order_count');
+                $data['order_amount30'] = DB::table('roi_team_total')->where('type', 3)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('order_amount');
 
                 $s45 = $idate. ' -45 day';
                 $date = date('Y-m-d', strtotime($s45));
-                $data['cost45'] = DB::table('roi_team_total')->where('type', 4)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('cost');
-                $data['order_count45'] = DB::table('roi_team_total')->where('type', 4)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('order_count');
-                $data['order_amount45'] = DB::table('roi_team_total')->where('type', 4)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('order_amount');
+                $data['cost45'] = DB::table('roi_team_total')->where('type', 4)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('cost');
+                $data['order_count45'] = DB::table('roi_team_total')->where('type', 4)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('order_count');
+                $data['order_amount45'] = DB::table('roi_team_total')->where('type', 4)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('order_amount');
 
                 $s60 = $idate. ' -60 day';
                 $date = date('Y-m-d', strtotime($s60));
-                $data['cost60'] = DB::table('roi_team_total')->where('type', 5)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('cost');
-                $data['order_count60'] = DB::table('roi_team_total')->where('type', 5)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('order_count');
-                $data['order_amount60'] = DB::table('roi_team_total')->where('type', 5)->where('team_id', $team_id)->where('ad_time', '<', $date)->sum('order_amount');
+                $data['cost60'] = DB::table('roi_team_total')->where('type', 5)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('cost');
+                $data['order_count60'] = DB::table('roi_team_total')->where('type', 5)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('order_count');
+                $data['order_amount60'] = DB::table('roi_team_total')->where('type', 5)->where('team_id', $team_id)->where('ad_time', '<=', $date)->sum('order_amount');
                 $res = DB::table('day_grand_team_total')->insert($data);
                 echo "\n日期：".$idate." 团队：".$team_id." 插入结果：".$res;
             }