充值表订单加id

app/Http/Controllers/Admin/StatisticsController.php

@@ -5106,8 +5106,8 @@ class StatisticsController extends Controller
             $consum = Order::select(DB::raw('count(1) as order_count, sum(receivedAmount) as order_amount'))->where('team_id', $v['team_id'])->where('payment_type', 4)->where('is_del', 0)->where('createTime', '>=', $v['date'])->where('createTime', '<=', $v['date'] . ' 23:59:59')->first();
             $v['order_count'] = $consum->order_count;
             $v['order_amount'] = $consum->order_amount;
-            //剩余是的金额
-            $v['day_amount'] = $v['deposit_amount'] - $v['order_amount'];
+            //剩余实的金额
+            //$v['day_amount'] = $v['deposit_amount'] - $v['order_amount'];
 
         }
 
@@ -5169,13 +5169,11 @@ class StatisticsController extends Controller
             $consum = Order::select(DB::raw('count(1) as order_count, sum(receivedAmount) as order_amount'))->where('team_id', $v['team_id'])->where('payment_type', 4)->where('is_del', 0)->where('createTime', '>=', $v['date'])->where('createTime', '<=', $v['date'] . ' 23:59:59')->first();
             $v['order_count'] = $consum->order_count;
             $v['order_amount'] = $consum->order_amount;
-            //剩余是的金额
-            $v['day_amount'] = $v['deposit_amount'] - $v['order_amount'];
 
         }
 
-        $indexKey = ['team_name','date','pay_amount','discount','deposit_amount','pay_amount_total','discount_total','deposit_amount_total','order_amount','order_count','day_amount'];
-        $title = ['团队', '日期', '当日充值金额', '当日赠送金额', '当日实得金额', '累计充值金额', '累计赠送金额', '累计实得总金额', '当日消费金额', '当日订单数', '剩余实得金额'];
+        $indexKey = ['team_name','date','pay_amount','discount','deposit_amount','pay_amount_total','discount_total','deposit_amount_total','order_amount','order_count'];
+        $title = ['团队', '日期', '当日充值金额', '当日赠送金额', '当日实得金额', '累计充值金额', '累计赠送金额', '累计实得总金额', '当日消费金额', '当日订单数'];
         $filename = 'chongzhihuizong_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title); 
     }
@@ -5368,8 +5366,8 @@ class StatisticsController extends Controller
             $v['cust_name'] = CustomerInfo::where('phone', $v['phone'])->pluck('name');
         }
 
-        $indexKey = ['team_name','createTime','cust_name','money','admin_name'];
-        $title = ['团队', '下单时间', '客户名称', '消费金额', '销售名称'];
+        $indexKey = ['team_name', 'id', 'createTime','cust_name','money','admin_name'];
+        $title = ['团队', '订单号', '下单时间', '客户名称', '消费金额', '销售名称'];
         $filename = 'xiaofeimingxi_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title); 
 

resources/views/statistics/consumDetail.blade.php

@@ -27,6 +27,7 @@
                 <thead>
                 <tr class="text-c">
                     <th width="5%">团队</th>
+                    <th width="5%">订单号</th>
                     <th width="5%">下单时间</th>
                     <th width="5%">客户名称</th>
                     <th width="5%">消费金额</th>
@@ -38,6 +39,7 @@
                     @foreach($result as $a)
                         <tr class="text-c" style=" text-align:center;">                           
                             <td>{{$a['team_name']}}</td>                            
+                            <td>{{$a['id']}}</td>
                             <td>{{$a['createTime']}}</td>
                             <td>{{$a['cust_name']}}</td>
                             <td>{{$a['money']}}</td>

resources/views/statistics/depositDayReport.blade.php

@@ -36,7 +36,6 @@
                     <th width="4%">累计实得总金额</th>
                     <th width="4%">当日消费金额</th>
                     <th width="4%">当日订单数</th>
-                    <th width="4%">剩余实得金额</th>
                                                                 
                 </tr>
                 </thead>
@@ -54,7 +53,6 @@
                             <td>{{$a['deposit_amount_total']}}</td>
                             <td>{{$a['order_amount']}}</td>
                             <td>{{$a['order_count']}}</td>
-                            <td>{{$a['day_amount']}}</td>
                             
                         </tr>
                     @endforeach