物流，刷新按钮

app/Http/Controllers/Admin/StatisticsController.php

@@ -309,7 +309,7 @@ class StatisticsController extends Controller
             //当日加粉
             $phones = DB::table('customers')->where('fanTime', $v['dtime'])->lists('phone');
             #当日加粉订单总计：
-            $order = DB::table('order')->select(DB::raw('sum(receivedAmount) as order_amount, count(1) as order_count, sum(cost) as order_cost'))->whereIn('receiverMobile', $phones)->where('createTime','<',$end_time)->where('is_del', 0)->where(function($query) use($team_id){
+            $order = DB::table('order')->select(DB::raw('sum(receivedAmount) as order_amount, count(1) as order_count, sum(cost) as order_cost, sum(freight_cost) as freight_cost'))->whereIn('receiverMobile', $phones)->where('createTime','<',$end_time)->where('is_del', 0)->where(function($query) use($team_id){
                 if($team_id>0) $query->where('team_id', $team_id);
             })->first();
             #当日新粉成单：            
@@ -339,8 +339,10 @@ class StatisticsController extends Controller
             $v['fugou_order_amount'] = $fugou->order_amount;
             #货品成本
             $v['order_cost'] = $order->order_cost;
+            //加物流成本
+            $v['freight_cost'] = $order->freight_cost;
             #毛利
-            $v['profit'] = $v['order_amount'] - $v['order_cost'] - $v['total_cost'];
+            $v['profit'] = $v['order_amount'] - $v['order_cost'] - $v['total_cost'] - $v['freight_cost'];
             //综合成单率 综合成单率=订单数/微信好友数
             $v['order_rate'] = $custDetail->wx_fan_add>0 ? round($order->order_count/$custDetail->wx_fan_add, 4) * 100 .'%' : '';
             //新粉成单率
@@ -351,7 +353,7 @@ class StatisticsController extends Controller
 
             //加roi
             $v['total_roi'] = $v['total_cost']>0 ? round($v['order_amount'] / $v['total_cost'], 4) * 100 .'%' : '';
-            $v['new_roi'] = $v['total_cost']>0 ? round($v['new_order_amount'] / $v['total_cost'], 4) * 100 .'%' : '';
+            $v['new_roi'] = $v['total_cost']>0 ? round($v['new_order_amount'] / $v['total_cost'], 4) * 100 .'%' : '';            
             
         }
 

resources/views/order/orderlist.blade.php

@@ -36,7 +36,7 @@
                 </select> 
                 <div style="float:right">
                     <a class="btn btn-primary radius" onclick="user_search()" href="javascript:;">搜索</a>
-                    <a class="btn btn-primary radius" onclick="order_export()" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 导出订单</a>
+                    <a class="btn btn-primary radius" onclick="order_export()" href="javascript:;"> 导出订单</a>
                     <!--a class="btn btn-primary radius" onclick="order_verify_more()" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 批量审核</a-->
                 </div>
             </div>
@@ -65,8 +65,7 @@
                     <th width="5%">退补备注</th>                 
                     <th width="4%">所属销售</th> 
                     <th width="4%">订单状态</th>                  
-                    @if($self_role =='销售' )<th width="5%">驳回原因</th>@endif                  
-                    <th width="3%">是否退款</th>                  
+                    @if($self_role =='销售' )<th width="5%">驳回原因</th>@endif                                    
                     <th width="5%">买家备注</th>                  
                     <th width="5%">卖家备注</th>                                                        
                     <th width="5%">发货备注</th>                                                        
@@ -127,7 +126,7 @@
                             <td id="order_verify{{$a['id']}}">{{$a['status_name']}}</td>
                             @if($self_role =='销售' ) <td>@if($a['status'] == 0)<font color='red'> {{$a['refuse_reason']}} </font> @endif</td> @endif
                            
-                            <td id="refund{{$a['id']}}">@if($a['order_status']==2) <span class="btn btn-danger radius">退款</span> @else 正常<br><span class="btn btn-primary radius" onclick="order_refund({{$a['id']}})">设为退款</span> @endif</td> 
+                            <!--td id="refund{{$a['id']}}">@if($a['order_status']==2) <span class="btn btn-danger radius">退款</span> @else 正常<br><span class="btn btn-primary radius" onclick="order_refund({{$a['id']}})">设为退款</span> @endif</td --> 
                             @if(($self_role =='销售' || $self_role =='管理员') && $a['status']>0)
                             <td>{{$a['buyerMemo']}}</td> 
                             <td>{{$a['sellerMemo']}}</td> 

resources/views/order/warehouselist.blade.php

@@ -29,8 +29,9 @@
                
                 <div style="float:right">
                     <a class="btn btn-primary radius" onclick="user_search()" href="javascript:;">搜索</a>
-                    <a class="btn btn-primary radius" onclick="order_export()" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 导出订单</a>
-                    <a class="btn btn-primary radius" onclick="importExcel('商品导入')" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 导入订单</a>
+                    <a class="btn btn-primary radius" onclick="order_export()" href="javascript:;">导出订单</a>
+                    <a class="btn btn-primary radius" onclick="importExcel('商品导入')" href="javascript:;"> 导入订单</a>
+                    <a class="btn btn-primary radius" onclick="window.location.reload();" href="javascript:;"> 刷新</a>
                 </div>
             </div>
         </div>

resources/views/statistics/orderDay.blade.php

@@ -39,6 +39,7 @@
                     <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>                                                 
@@ -63,6 +64,7 @@
                             <td>{{$a['order_amount']}}</td>                            
                             <td>{{$a['total_cost']}}</td>                            
                             <td>{{$a['order_cost']}}</td>                            
+                            <td>{{$a['freight_cost']}}</td>                            
                             <td>{{$a['profit']}}</td>                            
                             <td>{{$a['new_order_rate']}}</td>                                                       
                             <td>{{$a['fugou_rate']}}</td>