修复冲突

app/Http/Controllers/Admin/OrderController.php

@@ -68,6 +68,12 @@ class OrderController extends Controller
         })->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
         $result = json_decode(json_encode($result),true);
         
+        $status_arr = array(
+            0 => '待审核',
+            1 => '已审核',
+            2 => '已发货',
+            3 => '已完成',
+        );
         foreach($result as $k=>&$v){
             /*
             //获取商品信息
@@ -81,6 +87,7 @@ class OrderController extends Controller
             $fanTime = DB::table('customers')->select('fanTime')->where('phone', $v['receiverMobile'])->first();
             $v['fanTime'] = isset($fanTime->fanTime) ? $fanTime->fanTime : '';
             $v['receiverMobile'] = substr($v['receiverMobile'], 0, 3).'****'.substr($v['receiverMobile'], 7);
+            $v['status'] = $status_arr[$v['status']];
         }
         
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
@@ -129,8 +136,10 @@ class OrderController extends Controller
         $receiverName = trim($request->input('receiverName'));
         $receiverMobile = trim($request->input('receiverMobile'));
 
+
         //仓库管理员只能看到 918之后的数据
         $_start = '2019-09-18';
+        //仓库管理员只能看到已审核订单  
         $today_date = date('Y-m-d');
         $count = Order::where(function($query) use($admin_id, $stime, $etime, $today_date, $delivery_type, $receiverName, $receiverMobile, $_start){
             if($admin_id) $query->where('admin_id', $admin_id);
@@ -140,7 +149,8 @@ class OrderController extends Controller
             if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
             $query->where('createTime', '>=', $_start);
-        })->where('is_del',0)->where('warehouse', $warehouse)->count();
+        })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->count();
+
         if ($count > 1) {
             // 总页数
             $pages = ceil($count/$pageSize);
@@ -157,7 +167,8 @@ class OrderController extends Controller
             if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
             $query->where('createTime', '>=', $_start);
-        })->where('is_del',0)->where('warehouse', $warehouse)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
+        })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
+
         $result = json_decode(json_encode($result),true);
                 
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
@@ -453,6 +464,34 @@ class OrderController extends Controller
         exit('1');
     }
 
+    public function setverify($id){
+        $order = Order::find($id);
+        $order->status = 1;
+        if ($order ->save()){
+            exit('0');
+        }
+        exit('1');
+    }
+
+    public function setverifymore(Request $request){
+        $ids = $request->get('id');
+
+        foreach($ids as $id){
+            $order = Order::find($id);
+            $order->status = 1;
+            $order ->save();
+        }
+        $stime = $request->input('stime');
+        $etime = $request->input('etime');
+        $receiverName = $request->input('receiverName');
+        $receiverMobile = $request->input('receiverMobile');
+        $admin_id = (int)$request->input('admin_id');
+        $page = (int)$request->input('page');
+        $str_query = 'page='.$page.'&admin_id='.$admin_id.'&stime='.$stime.'&etime='.$etime.'&receiverName='.$receiverName.'&receiverMobile='.$receiverMobile;
+        return redirect('/admin/order/index?'.$str_query)->with('info', '操作成功');
+        
+    }
+
     /**
      * 分组管理-分组展示
      * @param Request $request
@@ -702,7 +741,8 @@ class OrderController extends Controller
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
             if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', '=', '');
             $query->where('createTime', '>=', $_start);
-        })->where('is_del',0)->orderBy('id', 'desc')->get();
+        })->where('is_del',0)->where('status', '>', 1)->orderBy('id', 'desc')->get();
+
         $result = json_decode(json_encode($result),true);
         foreach ($result as $k => &$v)
         {
@@ -711,7 +751,8 @@ class OrderController extends Controller
 
         $indexKey = ['id','goods_note','receiverName','receiverMobile','address','createTime','sellerMemo','buyerMemo','cost','logistics_id','freight_cost','send_note'];
         $title = ['订单编号', '商品信息', '收货人', '收货人手机号', '收货地址', '下单时间', '卖家备注', '买家备注', '供应商成本', '顺丰单号', '运费成本', '发货备注'];
-        return $this->export_excel($result, '订单数据.xlsx', $indexKey, $title);
+        $filename = 'dingdan_'.date('Y-m-d_H').'xlsx';
+        return $this->export_excel($result, $filename, $indexKey, $title);
  
     }
 

app/Http/routes.php

@@ -73,7 +73,9 @@ Route::group(['prefix' => 'admin'], function(){
         Route::get('/order/categoods/{category}', 'Admin\OrderController@categoods');
         Route::get('/order/teamAdmins/{team_id}', 'Admin\OrderController@teamAdmins');
         Route::get('/order/editLogisticsId', 'Admin\OrderController@editLogisticsId');
-        Route::get('/order/setrefund/{id}', 'Admin\OrderController@setrefund');
+        Route::get('/order/setrefund/{id}', 'Admin\OrderController@setrefund');  //设为退货
+        Route::get('/order/setverify/{id}', 'Admin\OrderController@setverify');  //设为已审核
+        Route::get('/order/setverifymore', 'Admin\OrderController@setverifymore');  //设为已审核
 
         //数据上报
         Route::get('/custreport/detailindex', 'Admin\CustReportController@detailindex');

resources/views/order/orderlist.blade.php

@@ -28,6 +28,7 @@
                 <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_verify_more()" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 批量审核</a>
                 </div>
             </div>
         </div>
@@ -36,15 +37,15 @@
             <table class="table table-border table-bordered table-bg table-hover table-sort">
                 <thead>
                 <tr class="text-c">
-                    <th width="4%">订单编号</th>
-                    <th width="3%">买家名称</th>
-                    <th width="3%">收货人</th>
-                    <th width="5%">收货人手机号</th>                    
-                    <th width="7%">收货地址</th>
+                    <th width="4%"><input type="checkbox" id="selected-all">订单编号</th>
+                    <th width="4%">买家名称</th>
+                    <th width="4%">收货人</th>
+                    <th width="4%">收货人手机号</th>
+                    <th width="6%">收货地址</th>
                     <th width="9%">商品信息</th>
                     <th width="4%">预发货时间</th>
                     <th width="6%">物流单号</th>                    
-                    @if($self_role !='销售' ) <th width="5%">成本</th> @endif
+                    @if($self_role !='销售' ) <th width="3%">成本</th> @endif
                     <th width="4%">发货仓库</th>
                     <th width="4%">付款金额</th>                  
                     <th width="5%">下单时间</th>
@@ -53,6 +54,7 @@
                     <th width="2%">是否退补单</th>                                                       
                     <th width="4%">应该退补差价</th>                  
                     <th width="4%">所属销售</th> 
+                    <th width="4%">订单状态</th>                  
                     <th width="3%">是否退款</th>                  
                     <th width="6%">买家备注</th>                  
                     <th width="6%">卖家备注</th>                  
@@ -63,7 +65,7 @@
                 @if($result)
                     @foreach($result as $a)
                         <tr class="text-c" style=" text-align:center;">                           
-                            <td>{{$a['id']}}</td>                            
+                            <td><input type="checkbox" name="id[]" value="{{$a['id']}}"> {{$a['id']}}</td>                            
                             <td>{{$a['customerName']}}</td>                            
                             <td>{{$a['receiverName']}}</td>                            
                             <td>{{$a['receiverMobile']}}</td>                                                                                    
@@ -95,6 +97,7 @@
                             <td>@if($a['is_refund']==1) 是 @else 否 @endif</td>
                             <td>{{$a['refund_price']}}</td>
                             <td>{{$a['admin_name']}}</td>
+                            <td id="order_verify{{$a['id']}}">{{$a['status']}}</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> 
                             <td class ="change_logistics_id"> 
                                 <p id="buyerMemo_1{{$a['id']}}">{{$a['buyerMemo']}}</p> 
@@ -109,6 +112,8 @@
                             </td> 
                             @if($self_role !='销售' )                                                                                                       
                             <td>
+                                @if($a['status'] == '待审核')<a id="verify" style="text-decoration:none" onClick='order_verify("{{$a['id']}}")' href="javascript:;" title="审核"><span class="btn btn-primary radius">审核通过</span></a>
+                                @endif
                                 <a style="text-decoration:none" onClick='order_edit("编辑","{{$a['id']}}")' href="javascript:;" title="编辑"><span class="btn btn-primary radius">编辑</span></a>
                                 <a style="text-decoration:none" onClick='order_del("删除","{{$a['id']}}")' href="javascript:;" title="删除"><span class="btn btn-danger radius">删除</span></a>
                             </td> 
@@ -276,6 +281,38 @@
             });
         }
 
+        function order_verify(id){
+            $.ajax({
+                url: '/admin/order/setverify/'+id,
+                type: 'get',
+                dateType: 'json',
+                success:function(msg){
+                    var str = '已审核';
+                    $("#order_verify"+id).html(str);                    
+                    $("#verify").hide()                   
+                }
+            });
+        }
+
+        function order_verify_more(){
+            var ids = $(":checkbox[name='id[]']:checked").serialize();
+            var idLength = $(":checkbox[name='id[]']:checked").length;
+
+            if (idLength < 1) {
+                alert("请至少选中一项");
+                return false;
+            }
+            var ids = $(":checkbox[name='id[]']:checked").serialize();
+
+            var admin_id = $('#admin_id').val();
+            var stime = $('#stime').val();
+            var etime = $('#etime').val();
+            var receiverName = $('#receiverName').val();
+            var receiverMobile = $('#receiverMobile').val();
+            var page = {{$page}};
+            location.href = '/admin/order/setverifymore?'+ids+'&page='+page+'&admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
+        }
+
          $(".change_logistics_id").mouseover(
             function(){
                 $(this).children("span").show();