区分支付方式金额

app/Http/Controllers/Admin/StatisticsController.php

@@ -1784,14 +1784,14 @@ class StatisticsController extends Controller
 
         $teams = DB::table('teams')->lists('name', 'id');
         if($aftersale == 1){
-            $result = Order::select(DB::raw('left(aftersale_time, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
+            $result = Order::select(DB::raw('left(aftersale_time, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost, sum(if(payment_type=1,receivedAmount,null)) as wx_money'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
                 if($team_id) $query->where('team_id', $team_id);
                 if($stime) $query->where('aftersale_time', '>=', $stime);
                 if($etime) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
                 if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
             })->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->orderBy('team_id', 'asc')->orderBy('aftersale_time','desc')->offset($offset)->limit($pageSize)->get();
         }else{
-            $result = Order::select(DB::raw('left(createTime, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
+            $result = Order::select(DB::raw('left(createTime, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost, sum(if(payment_type=1,receivedAmount,null)) as wx_money'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
                 if($team_id) $query->where('team_id', $team_id);
                 if($stime) $query->where('createTime', '>=', $stime);
                 if($etime) $query->where('createTime', '<=', $etime.' 23:59:59');
@@ -1802,6 +1802,7 @@ class StatisticsController extends Controller
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';
             $v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];
+            $v['zfm_money'] = $v['receivedAmount'] - $v['wx_money'];
         }
 
         $teamList = DB::table('teams')->select('id', 'name')->get();
@@ -1869,14 +1870,14 @@ class StatisticsController extends Controller
        
         $teams = DB::table('teams')->lists('name', 'id');
         if($aftersale == 1){
-            $result = Order::select(DB::raw('left(aftersale_time, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
+            $result = Order::select(DB::raw('left(aftersale_time, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost, sum(if(payment_type=1,receivedAmount,null)) as wx_money'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
                 if($team_id) $query->where('team_id', $team_id);
                 if($stime) $query->where('aftersale_time', '>=', $stime);
                 if($etime) $query->where('aftersale_time', '<=', $etime.' 23:59:59');
                 if($aftersale == 1) $query->where('aftersale_fee', '>', 0);
             })->where('is_del', 0)->groupBy('team_id')->groupBy('ctime')->orderBy('team_id', 'asc')->orderBy('aftersale_time','desc')->get();
         }else{
-            $result = Order::select(DB::raw('left(createTime, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
+            $result = Order::select(DB::raw('left(createTime, 10) as ctime, team_id, count(1) as order_count, sum(receivedAmount) as receivedAmount, sum(aftersale_fee) as aftersale_fee, sum(refund_price) as refund_price, sum(cost) as cost, sum(freight_cost) as freight_cost, sum(if(payment_type=1,receivedAmount,null)) as wx_money'))->where(function($query) use($team_id, $stime, $etime, $aftersale){
                 if($team_id) $query->where('team_id', $team_id);
                 if($stime) $query->where('createTime', '>=', $stime);
                 if($etime) $query->where('createTime', '<=', $etime.' 23:59:59');
@@ -1887,10 +1888,16 @@ class StatisticsController extends Controller
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';
             $v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];
+            $v['zfm_money'] = $v['receivedAmount'] - $v['wx_money'];
         }
 
-        $indexKey = ['team_name','ctime','order_count','receivedAmount','aftersale_fee','refund_price','true_amount','cost','freight_cost'];
-        $title = ['团队', '时间', '总单数', '成交金额', '售后', '退补差价', '实际金额', '供应商成本', '物流成本'];
+        if($aftersale==0){
+            $indexKey = ['team_name','ctime','order_count','receivedAmount','wx_money','zfm_money','aftersale_fee','refund_price','true_amount','cost','freight_cost'];
+            $title = ['团队', '时间', '总单数', '成交金额', '微信支付金额','付款码支付金额', '售后', '退补差价', '实际金额', '供应商成本', '物流成本'];
+        }else{
+            $indexKey = ['team_name','ctime','order_count','receivedAmount','aftersale_fee','refund_price','true_amount','cost','freight_cost'];
+            $title = ['团队', '时间', '总单数', '成交金额', '售后', '退补差价', '实际金额', '供应商成本', '物流成本'];
+        }
         $filename = $aftersale==0 ? 'dingdanhuizong_'.date('Y-m-d_H').'.xlsx' : 'shouhouhuizong_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
 

resources/views/statistics/teamFinanceTotal.blade.php

@@ -30,6 +30,10 @@
                     <th width="5%">时间</th>
                     <th width="5%">总单数</th>
                     <th width="5%">成交金额</th>
+                    @if($aftersale==0)
+                    <th width="5%">微信支付金额</th>
+                    <th width="5%">付款码支付金额</th>
+                    @endif
                     <th width="5%">售后</th>
                     <th width="5%">退补差价</th>
                     <th width="5%">实际金额</th>
@@ -45,6 +49,10 @@
                             <td>{{$a['ctime']}}</td>
                             <td>{{$a['order_count']}}</td>
                             <td>{{$a['receivedAmount']}}</td>
+                            @if($aftersale==0)
+                            <td>{{$a['wx_money']}}</td>
+                            <td>{{$a['zfm_money']}}</td>
+                            @endif
                             <td>{{$a['aftersale_fee']}}</td>
                             <td>{{$a['refund_price']}}</td>
                             <td>{{$a['true_amount']}}</td>