Browse Source

财务表加充值卡

sunhao 5 years ago
parent
commit
7d74a6ee59

+ 2 - 2
app/Http/Controllers/Admin/StatisticsController.php

@@ -1998,8 +1998,8 @@ class StatisticsController extends Controller
1998 1998
 
1999 1999
         }
2000 2000
 
2001
-        $indexKey = ['team_name','ctime','order_count','receivedAmount','wx_money','zfm_money','gth_money','aftersale_count','aftersale_fee','wx_refund_count','wx_refund_price','wx_true_amount','zfm_refund_count','zfm_refund_price','zfm_true_amount','gth_refund_count','gth_refund_price','gth_true_amount', 'send_count', 'cost', 'freight_cost', 'profit'];
2002
-        $title = ['团队', '时间', '总单数', '成交金额', '微信支付金额','付款码支付金额', '个体户支付', '售后单数', '售后金额', '微信退补单数', '微信退补差价', '微信实际金额', '付款码退补单数', '付款码退补差价', '付款码实际金额', '个体户退补单数', '个体户退补差价', '个体户实际金额', '发货单数', '货品成本', '物流成本', '毛利'];
2001
+        $indexKey = ['team_name','ctime','order_count','receivedAmount','wx_money','zfm_money','gth_money', 'vip_money', 'aftersale_count','aftersale_fee','wx_refund_count','wx_refund_price','wx_true_amount','zfm_refund_count','zfm_refund_price','zfm_true_amount','gth_refund_count','gth_refund_price','gth_true_amount', 'send_count', 'cost', 'freight_cost', 'profit'];
2002
+        $title = ['团队', '时间', '总单数', '成交金额', '微信支付金额','付款码支付金额', '个体户支付', '充值卡支付金额', '售后单数', '售后金额', '微信退补单数', '微信退补差价', '微信实际金额', '付款码退补单数', '付款码退补差价', '付款码实际金额', '个体户退补单数', '个体户退补差价', '个体户实际金额', '发货单数', '货品成本', '物流成本', '毛利'];
2003 2003
         
2004 2004
         $filename = 'dingdanhuizong_'.date('Y-m-d_H').'.xlsx';
2005 2005
         return Order::export_excel($result, $filename, $indexKey, $title);

+ 5 - 3
resources/views/statistics/teamFinanceTotal.blade.php

@@ -30,9 +30,10 @@
30 30
                     <th width="5%">时间</th>
31 31
                     <th width="4%">总单数</th>
32 32
                     <th width="5%">成交金额</th>
33
-                    <th width="5%">微信支付金额</th>
34
-                    <th width="5%">付款码支付金额</th>
35
-                    <th width="5%">个体户支付金额</th>
33
+                    <th width="4%">微信支付金额</th>
34
+                    <th width="4%">付款码支付金额</th>
35
+                    <th width="4%">个体户支付金额</th>
36
+                    <th width="5%">充值卡支付金额</th>
36 37
                     <th width="4%">售后单数</th>
37 38
                     <th width="5%">售后金额</th>
38 39
                     <th width="4%">微信退补单数</th>
@@ -62,6 +63,7 @@
62 63
                             <td>{{$a['wx_money']}}</td>
63 64
                             <td>{{$a['zfm_money']}}</td>
64 65
                             <td>{{$a['gth_money']}}</td>
66
+                            <td>{{$a['vip_money']}}</td>
65 67
                             <td>{{$a['aftersale_count']}}</td>
66 68
                             <td>{{$a['aftersale_fee']}}</td>
67 69
                             <td>{{$a['wx_refund_count']}}</td>