解决冲突

app/Http/Controllers/Admin/StatisticsController.php

@@ -1482,7 +1482,7 @@ class StatisticsController extends Controller
         $ret = AdCost::select('id')->where(function($query) use($stime, $etime, $city){    
             if($stime) $query->where('ad_time', '>=', $stime);
             if($etime) $query->where('ad_time', '<=', $etime);
-            if($city) $query->where('city', '=', $city);
+            if($city) $query->where('city', 'like', '%'.$city.'%');
         })->groupBy('ad_time')->groupBy('city')->get();
         $ret = json_decode(json_encode($ret), true);
 
@@ -1536,6 +1536,9 @@ class StatisticsController extends Controller
             'order_amount' => 0,
             'roi' => 0,
             'conversion_times' => 0,
+            'new_order_count' => 0,
+            'new_order_amount' => 0,
+            'new_roi' => 0,
         ];
 
         //投入
@@ -1558,6 +1561,11 @@ class StatisticsController extends Controller
         $total_data['order_count'] = $order->order_count;
         $total_data['order_amount'] = $order->order_amount;
         $total_data['roi'] = $total_data['cost']>0 ? round($total_data['order_amount'] / $total_data['cost'], 4) * 100 .'%' : '';
+        #总新粉成单：            
+        $new_order = DB::table('order')->select(DB::raw('sum(receivedAmount) as order_amount, count(1) as order_count'))->leftJoin('customers as cu','cu.phone', '=', 'order.receiverMobile')->whereRaw('left(order.createTime, 10) = cu.fanTime')->where('order.is_del', 0)->whereIn('receiverMobile', $phones)->first();
+        $total_data['new_order_count'] = $new_order->order_count;
+        $total_data['new_order_amount'] = $new_order->order_amount;
+        $total_data['new_roi'] = $total_data['cost']>0 ? round($total_data['new_order_amount'] / $total_data['cost'], 4) * 100 .'%' : '';
 
         return view('statistics/districtRoi', ['result' =>$result,
             'page'              =>$page,
@@ -1623,6 +1631,9 @@ class StatisticsController extends Controller
             'order_amount' => 0,
             'roi' => 0,
             'conversion_times' => 0,
+            'new_order_count' => 0,
+            'new_order_amount' => 0,
+            'new_roi' => 0,
         ];
 
         //投入
@@ -1646,13 +1657,18 @@ class StatisticsController extends Controller
         $total_data['order_amount'] = $order->order_amount;
         $total_data['roi'] = $total_data['cost']>0 ? round($total_data['order_amount'] / $total_data['cost'], 4) * 100 .'%' : '';
 
+        #总新粉成单：            
+        $new_order = DB::table('order')->select(DB::raw('sum(receivedAmount) as order_amount, count(1) as order_count'))->leftJoin('customers as cu','cu.phone', '=', 'order.receiverMobile')->whereRaw('left(order.createTime, 10) = cu.fanTime')->where('order.is_del', 0)->whereIn('receiverMobile', $phones)->first();
+        $total_data['new_order_count'] = $new_order->order_count;
+        $total_data['new_order_amount'] = $new_order->order_amount;
+        $total_data['new_roi'] = $total_data['cost']>0 ? round($total_data['new_order_amount'] / $total_data['cost'], 4) * 100 .'%' : '';
+
         $indexKey = ['ad_time','city','total_cost','conversion_times','new_fan_count','new_order_count','new_order_amount','new_roi','order_count','order_amount','total_roi'];
         $title = ['日期', '城市', '投放成本', '加粉数', '新粉数量', '新粉成单数', '新粉收入', '新粉ROI', '累计成单数', '累计收入', '累计ROI'];
         $filename = 'district_roi_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     }
 
-
     /**
      * 团队订单财务明细
      */
@@ -1660,11 +1676,13 @@ class StatisticsController extends Controller
         $team_id = (int)$request->input('team_id');
         $stime = $request->input('stime');
         $etime = $request->input('etime');
+
         $page = (int)$request->input('page');
         $pageSize = 20;
         if($page<=0){
             $page = 1;
         }
+
         $offset = ($page-1) * $pageSize;
 
         $count = Order::where(function($query) use($team_id, $stime, $etime){
@@ -1727,6 +1745,7 @@ class StatisticsController extends Controller
             if($etime) $query->where('createTime', '<=', $etime.' 23:59:59');
         })->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->get();
         $count = count($count);
+
         if ($count > 1) {
             // 总页数
             $pages = ceil($count/$pageSize);
@@ -1789,7 +1808,7 @@ class StatisticsController extends Controller
     }
 
     /**
-     * 团队财务明细导出
+     * 团队财务汇总导出
      */
     public function teamFinanceTotal_export(Request $request){
         $team_id = (int)$request->input('team_id');
@@ -1812,6 +1831,67 @@ class StatisticsController extends Controller
         $title = ['团队', '时间', '总单数', '成交金额', '售后', '退补差价', '实际金额', '供应商成本', '物流成本'];
         $filename = 'teamFinanceTotal_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
+
+    }
+
+    /**
+     * 地区汇总roi
+     */
+    public function districtTotalRoi(Request $request){
+
+        $offset = ($page-1) * $pageSize;
+        $city = $request->input('city');
+
+        if($city !== null){
+            $city = str_replace('市', '', $city);
+        }       
+
+        $ret = AdCost::select('id')->where(function($query) use($city){    
+            if($city) $query->where('city', 'like', '%'.$city.'%');
+        })->groupBy('city')->get();
+        $ret = json_decode(json_encode($ret), true);
+
+        $count = count($ret);
+
+        $result = AdCost::select(DB::raw('sum(cost) as total_cost, sum(conversion_times) as conversion_times, city'))->where(function($query) use($city){    
+            if($city) $query->where('city', 'like', '%'.$city.'%');
+        })->groupBy('city')->offset($offset)->limit($pageSize)->get();
+
+        $result = json_decode(json_encode($result), true);
+
+        foreach($result as $k=>&$v){
+            //新粉收入
+            //加粉
+            $city_name = str_replace('市', '', $v['city']);
+            $phones = DB::table('customers')->where('receiverCity','like', '%'.$city_name.'%')->lists('phone');
+            #订单总计：
+            $order = DB::table('order')->select(DB::raw('sum(receivedAmount) as order_amount, count(1) as order_count'))->whereIn('receiverMobile', $phones)->where('is_del', 0)->first();
+            
+            #汇总新粉成单：            
+            $new_order = DB::table('order')->select(DB::raw('sum(receivedAmount) as order_amount, count(1) as order_count'))->leftJoin('customers as cu','cu.phone', '=', 'order.receiverMobile')->whereRaw('left(order.createTime, 10) = cu.fanTime')->where('order.is_del', 0)->whereIn('receiverMobile', $phones)->first();
+            // 1.新粉成单数
+            $v['new_order_count'] = $new_order->order_count;
+            // 2.新粉成交额 
+            $v['new_order_amount'] = $new_order->order_amount;
+            // 3.粉丝总成交额
+            $v['order_amount'] = $order->order_amount;
+            // 总单数
+            $v['order_count'] = $order->order_count;
+            //新粉roi
+            $v['new_roi'] = $v['total_cost']>0 ? round($v['new_order_amount'] / $v['total_cost'], 4) * 100 .'%' : '';
+            //累计roi
+            $v['total_roi'] = $v['total_cost']>0 ? round($v['order_amount'] / $v['total_cost'], 4) * 100 .'%' : '';
+            $v['new_fan_count'] = count($phones);
+
+        }
+
+        return view('statistics/districtTotalRoi', ['result' =>$result,
+            'page'              =>$page,
+            'count'             =>$count,
+            'pages'             =>$pages,                                    
+            'city'             =>$city,                    
+            ]);
+
     }
 }
 

resources/views/statistics/districtRoi.blade.php

@@ -26,6 +26,9 @@
                     <li>总投放成本：&yen;{{$total_data['cost']}}&nbsp;&nbsp;&nbsp;&nbsp;
                     总加粉数：{{$total_data['conversion_times']}}&nbsp;&nbsp;&nbsp;&nbsp;
                     总新粉数量：{{$total_data['fan_count']}}&nbsp;&nbsp;&nbsp;&nbsp;
+                    新粉成单数：{{$total_data['new_order_count']}}&nbsp;&nbsp;&nbsp;&nbsp;
+                    新粉收入：&yen;{{$total_data['new_order_amount']}}&nbsp;&nbsp;&nbsp;&nbsp;
+                    新粉ROI：{{$total_data['new_roi']}}&nbsp;&nbsp;&nbsp;&nbsp;
                     总成单数：{{$total_data['order_count']}}&nbsp;&nbsp;&nbsp;&nbsp;
                     总收入：&yen;{{$total_data['order_amount']}}&nbsp;&nbsp;&nbsp;&nbsp;
                     总计ROI：{{$total_data['roi']}}</li>