Merge branch 'zjl_adjust_20181026' into development

app/Http/Controllers/OrderController.php

@@ -1704,6 +1704,8 @@ Class OrderController extends Controller
         ->groupBy('sub.user_id')
         ->groupBy('sub.user_id')
         ->chunk(100, function($orderCount) {
         ->chunk(100, function($orderCount) {
             foreach ($orderCount as $k=>$v) { 
             foreach ($orderCount as $k=>$v) { 
+                $new_user = $new_order = [];
+                
                 if ($v->order_count == 1) {
                 if ($v->order_count == 1) {
                     $new_user['is_new'] = 1; // 新用户
                     $new_user['is_new'] = 1; // 新用户
                     $new_order['is_new'] = 1; // 新订单
                     $new_order['is_new'] = 1; // 新订单
@@ -1714,8 +1716,17 @@ Class OrderController extends Controller
 
 
                 // 更新用户
                 // 更新用户
                 DB::connection('order')->table('lie_user_main')->where('user_id', $v->user_id)->update($new_user);
                 DB::connection('order')->table('lie_user_main')->where('user_id', $v->user_id)->update($new_user);
-                // 更新订单          
-                DB::connection('order')->table('lie_order_extend')->where('order_id', $v->order_id)->update($new_order);
+
+                $extend = DB::connection('order')->table('lie_order_extend')->where('order_id', $v->order_id)->first();
+
+                if ($extend) {
+                    // 更新订单          
+                    DB::connection('order')->table('lie_order_extend')->where('order_id', $v->order_id)->update($new_order);
+                } else {
+                    // 创建  
+                    $new_order['order_id'] = $v->order_id;   
+                    DB::connection('order')->table('lie_order_extend')->insert($new_order);
+                }    
             }
             }
         });
         });
     }
     }

resources/views/detail/content.blade.php

@@ -217,11 +217,11 @@
                     @if (!$isPage)
                     @if (!$isPage)
                         <!-- 发票状态小于2（已发货）且更改权限存在 显示按钮 -->
                         <!-- 发票状态小于2（已发货）且更改权限存在 显示按钮 -->
                         @if (!isset($_REQUEST['tags']))
                         @if (!isset($_REQUEST['tags']))
-                            @if($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms))
+                            @if(in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms))
                                 <a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                                 <a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                             @endif
                             @endif
                         @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && !$extend)
                         @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && !$extend)
-                            @if($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms))
+                            @if(in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms))
                                 <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                                 <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                             @endif
                             @endif
                         @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')
                         @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')