财务退补报表区别付款方式

app/Http/Controllers/Admin/StatisticsController.php

@@ -1791,9 +1791,20 @@ class StatisticsController extends Controller
             $refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('refund_time', '=', $ctime);
-            })->where('is_del', 0)->where('refund_time', '>', '')->first();
+            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
             $v['refund_count'] = $refund_info->refund_count;
             $v['refund_price'] = $refund_info->refund_price;
+            //wx退补
+            $wx_refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where('refund_type', 1)->where(function($query) use($team, $ctime){
+                $query->where('team_id', $team);
+                $query->where('refund_time', '=', $ctime);
+            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
+            $v['wx_refund_count'] = $wx_refund_info->refund_count;
+            $v['wx_refund_price'] = $wx_refund_info->refund_price;
+            //付款码退补
+            $v['zfm_refund_count'] = $v['refund_count'] - $v['wx_refund_count'];
+            $v['zfm_refund_price'] = $v['refund_price'] - $v['wx_refund_price'];
+
             #发货
             $send_info = Order::select(DB::raw('count(1) as send_count, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
@@ -1803,8 +1814,12 @@ class StatisticsController extends Controller
             $v['cost'] = $send_info->cost;
             $v['freight_cost'] = $send_info->freight_cost;
 
-            $v['true_amount'] = $v['receivedAmount'] + $v['refund_price'] - $v['aftersale_fee'];
-            $v['zfm_money'] = $v['receivedAmount'] - $v['wx_money'];
+            $v['zfm_money'] = $v['receivedAmount'] - $v['wx_money'];           
+            $v['wx_true_amount'] = $v['wx_money'] + $v['wx_refund_price'] - $v['aftersale_fee'];
+            $v['zfm_true_amount'] = $v['zfm_money'] + $v['zfm_refund_price'];
+
+            #毛利
+            $v['profit'] = $v['wx_true_amount'] + $v['zfm_true_amount'] - $v['cost'] - $v['freight_cost'];
         }
 
         $teamList = DB::table('teams')->select('id', 'name')->get();
@@ -1884,25 +1899,40 @@ class StatisticsController extends Controller
             $refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('refund_time', '=', $ctime);
-            })->where('is_del', 0)->where('refund_time', '>', '')->first();
+            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
             $v['refund_count'] = $refund_info->refund_count;
             $v['refund_price'] = $refund_info->refund_price;
+            //wx退补
+            $wx_refund_info = Order::select(DB::raw('count(1) as refund_count, sum(refund_price) as refund_price'))->where('refund_type', 1)->where(function($query) use($team, $ctime){
+                $query->where('team_id', $team);
+                $query->where('refund_time', '=', $ctime);
+            })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->first();
+            $v['wx_refund_count'] = $wx_refund_info->refund_count;
+            $v['wx_refund_price'] = $wx_refund_info->refund_price;
+            //付款码退补
+            $v['zfm_refund_count'] = $v['refund_count'] - $v['wx_refund_count'];
+            $v['zfm_refund_price'] = $v['refund_price'] - $v['wx_refund_price'];
+
             #发货
             $send_info = Order::select(DB::raw('count(1) as send_count, sum(cost) as cost, sum(freight_cost) as freight_cost'))->where(function($query) use($team, $ctime){
                 $query->where('team_id', $team);
                 $query->where('send_time', '=', $ctime);
-            })->where('is_del', 0)->where('logistics_id','>','')->first();
+            })->where('is_del', 0)->where('logistics_id', '>', '')->first();
             $v['send_count'] = $send_info->send_count;
             $v['cost'] = $send_info->cost;
             $v['freight_cost'] = $send_info->freight_cost;
 
-            $v['true_amount'] = $v['receivedAmount'] + $v['refund_price'] - $v['aftersale_fee'];
-            $v['zfm_money'] = $v['receivedAmount'] - $v['wx_money'];
+            $v['zfm_money'] = $v['receivedAmount'] - $v['wx_money'];           
+            $v['wx_true_amount'] = $v['wx_money'] + $v['wx_refund_price'] - $v['aftersale_fee'];
+            $v['zfm_true_amount'] = $v['zfm_money'] + $v['zfm_refund_price'];
+
+            #毛利
+            $v['profit'] = $v['wx_true_amount'] + $v['zfm_true_amount'] - $v['cost'] - $v['freight_cost'];
         }
 
 
-        $indexKey = ['team_name','ctime','order_count','receivedAmount','wx_money','zfm_money','aftersale_count','aftersale_fee','refund_count','refund_price','true_amount', 'send_count', 'cost', 'freight_cost'];
-        $title = ['团队', '时间', '总单数', '成交金额', '微信支付金额','付款码支付金额', '售后单数', '售后金额', '退补单数', '退补差价', '实际金额', '发货单数', '货品成本', '物流成本'];
+        $indexKey = ['team_name','ctime','order_count','receivedAmount','wx_money','zfm_money','aftersale_count','aftersale_fee','wx_refund_count','wx_refund_price','wx_true_amount','zfm_refund_count','zfm_refund_price','zfm_true_amount', 'send_count', 'cost', 'freight_cost', 'profit'];
+        $title = ['团队', '时间', '总单数', '成交金额', '微信支付金额','付款码支付金额', '售后单数', '售后金额', '微信退补单数', '微信退补差价', '微信实际金额', '付款码退补单数', '付款码退补差价', '付款码实际金额', '发货单数', '货品成本', '物流成本', '毛利'];
         
         $filename = 'dingdanhuizong_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
@@ -1994,7 +2024,7 @@ class StatisticsController extends Controller
             if($stime) $query->where('refund_time', '>=', $stime);
             if($etime) $query->where('refund_time', '<=', $etime);
 
-        })->where('is_del', 0)->where('refund_time', '>', '')->count();
+        })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1)->count();
         if ($count > 1) {
             // 总页数
             $pages = ceil($count/$pageSize);
@@ -2004,11 +2034,11 @@ class StatisticsController extends Controller
         }
 
         $teams = DB::table('teams')->lists('name', 'id');
-        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'refund_price', 'payment_type', 'refund_time')->where(function($query) use($team_id, $stime, $etime){
+        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'refund_price', 'payment_type', 'refund_time', 'refund_note', 'refund_type')->where(function($query) use($team_id, $stime, $etime){
             if($team_id) $query->where('team_id', $team_id);
             if($stime ) $query->where('refund_time', '>=', $stime);
             if($etime ) $query->where('refund_time', '<=', $etime);
-        })->where('is_del', 0)->where('refund_time', '>', '');
+        })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1);
 
         $result = $resultQuery->orderBy('refund_time','desc')->offset($offset)->limit($pageSize)->get();
         
@@ -2018,6 +2048,14 @@ class StatisticsController extends Controller
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
             $v['ctime'] = $v['refund_time'];
+            //退补支付方式
+            if($v['refund_type'] == 1){
+                $v['refund_type'] = '微信支付';
+            }elseif($v['refund_type'] == 2){
+                $v['refund_type'] = '付款码支付';
+            }else{
+                $v['refund_type'] = '';
+            }   
         }
 
         $teamList = DB::table('teams')->select('id', 'name')->get();
@@ -2138,11 +2176,11 @@ class StatisticsController extends Controller
         $etime = $request->input('etime');
 
         $teams = DB::table('teams')->lists('name', 'id');
-        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'refund_price', 'payment_type', 'refund_time')->where(function($query) use($team_id, $stime, $etime){
+        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'refund_price', 'payment_type', 'refund_time', 'refund_note', 'refund_type')->where(function($query) use($team_id, $stime, $etime){
             if($team_id) $query->where('team_id', $team_id);
             if($stime ) $query->where('refund_time', '>=', $stime);
             if($etime ) $query->where('refund_time', '<=', $etime);
-        })->where('is_del', 0)->where('refund_time', '>', '');
+        })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1);
 
         $result = $resultQuery->orderBy('refund_time','desc')->get();
         
@@ -2152,10 +2190,18 @@ class StatisticsController extends Controller
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
             $v['ctime'] = $v['refund_time'];
+            //退补支付方式
+            if($v['refund_type'] == 1){
+                $v['refund_type'] = '微信支付';
+            }elseif($v['refund_type'] == 2){
+                $v['refund_type'] = '付款码支付';
+            }else{
+                $v['refund_type'] = '';
+            } 
         }
 
-        $indexKey = ['team_name','ctime','id','receivedAmount','refund_price', 'payment_type'];      
-        $title = ['团队', '退补时间', '订单编号', '成交金额','退补差价', '支付方式'];
+        $indexKey = ['team_name','ctime','id','receivedAmount', 'payment_type','refund_price', 'refund_type'];      
+        $title = ['团队', '退补时间', '订单编号', '成交金额', '支付方式', '退补差价', '退补支付方式'];
         $filename = 'tuibumingxi_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     } 

resources/views/statistics/refundFinanceList.blade.php

@@ -30,9 +30,9 @@
                     <th width="5%">退补时间</th>
                     <th width="5%">订单编号</th>
                     <th width="5%">成交金额</th>                
-                    <th width="5%">退补金额</th>                
-                                              
-                    <th width="5%">支付方式</th>                                                
+                    <th width="5%">支付方式</th>                
+                    <th width="5%">退补金额</th>                                                             
+                    <th width="5%">退补支付方式</th>                                                
                 </tr>
                 </thead>
                 <tbody>
@@ -42,10 +42,10 @@
                             <td>{{$a['team_name']}}</td>                            
                             <td>{{$a['ctime']}}</td>
                             <td>{{$a['id']}}</td>
-                            <td>{{$a['receivedAmount']}}</td>                      
+                            <td>{{$a['receivedAmount']}}</td>  
+                            <td>{{$a['payment_type']}}</td>                    
                             <td>{{$a['refund_price']}}</td>                      
-
-                            <td>{{$a['payment_type']}}</td>
+                            <td>{{$a['refund_type']}}</td>
 
                         </tr>
                     @endforeach

resources/views/statistics/teamFinanceTotal.blade.php

@@ -34,12 +34,16 @@
                     <th width="5%">付款码支付金额</th>
                     <th width="5%">售后单数</th>
                     <th width="5%">售后金额</th>
-                    <th width="5%">退补单数</th>
-                    <th width="5%">退补差价</th>
-                    <th width="5%">实际金额</th>
+                    <th width="5%">微信退补单数</th>
+                    <th width="5%">微信退补差价</th>
+                    <th width="5%">微信实际金额</th>
+                    <th width="5%">付款码退补单数</th>
+                    <th width="5%">付款码退补差价</th>
+                    <th width="5%">付款码实际金额</th>
                     <th width="5%">发货单数</th>
                     <th width="5%">货品成本</th>
                     <th width="5%">物流成本</th>
+                    <th width="5%">毛利</th>
                                              
                 </tr>
                 </thead>
@@ -55,12 +59,16 @@
                             <td>{{$a['zfm_money']}}</td>
                             <td>{{$a['aftersale_count']}}</td>
                             <td>{{$a['aftersale_fee']}}</td>
-                            <td>{{$a['refund_count']}}</td>
-                            <td>{{$a['refund_price']}}</td>
-                            <td>{{$a['true_amount']}}</td>
+                            <td>{{$a['wx_refund_count']}}</td>
+                            <td>{{$a['wx_refund_price']}}</td>
+                            <td>{{$a['wx_true_amount']}}</td>
+                            <td>{{$a['zfm_refund_count']}}</td>
+                            <td>{{$a['zfm_refund_price']}}</td>
+                            <td>{{$a['zfm_true_amount']}}</td>
                             <td>{{$a['send_count']}}</td>
                             <td>{{$a['cost']}}</td>
                             <td>{{$a['freight_cost']}}</td>
+                            <td>{{$a['profit']}}</td>
 
                         </tr>
                     @endforeach