Merge branch 'master' into development

app/Http/Controllers/OrderController.php

@@ -260,6 +260,14 @@ function isChangeInvoice($order_sn)
     }
     }
 }
 }
 
 
+// 自营线下订单
+function getOrderExtend($order_id)
+{
+    $extend = DB::connection('order')->table('lie_order_extend')->where(['order_id' => $order_id, 'order_type' => 3])->select('temp_id')->first();
+
+    return $extend ? true : false;
+}
+
 Class OrderController extends Controller
 Class OrderController extends Controller
 {
 {
     // 首页
     // 首页

resources/views/selfOrder/content.blade.php

@@ -276,7 +276,8 @@
                                 <div class="btn-group btn-group-xs">
                                 <div class="btn-group btn-group-xs">
 	                                <a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=self" target="_blank">详情</a>
 	                                <a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=self" target="_blank">详情</a>
                                     
                                     
-                                    @if (in_array('self_check_order', $userPerms) && in_array($v['status'], [1, 2, 3]))
+                                    <?php $extend = App\Http\Controllers\getOrderExtend($v['order_id']); ?>
+                                    @if (in_array('self_check_order', $userPerms) && in_array($v['status'], [1, 2]) && !$extend)
                                         <a class="btn btn-success" href="/change/{{$v['order_id']}}?tags=self" target="_blank">人工审单</a>
                                         <a class="btn btn-success" href="/change/{{$v['order_id']}}?tags=self" target="_blank">人工审单</a>
                                     @endif
                                     @endif