Merge branch 'zjl_inquiry_order_20210311' into development

app/Http/Controllers/ApiController.php

@@ -609,7 +609,11 @@ class ApiController extends Controller
         $com_name = DB::connection('order')->table('lie_invoice_company')->where('id', $com_id)->value('com_name');
         if (!$com_name) $this->Export(-1, '当前公司不存在');
 
-        $invoice = DB::connection('order')->table('lie_taxinfo')->where(['tax_title'=>$com_name, 'inv_type'=>$invoice_type])->first();
+        $map = [];
+        $map['tax_title'] = $com_name; 
+        $map['user_id']   = $user_id; 
+        $map['inv_type']  = $invoice_type; 
+        $invoice = DB::connection('order')->table('lie_taxinfo')->where($map)->first();
 
         $tax_info['tax_id']    = isset($invoice) ? $invoice->tax_id : 0;
         $tax_info['tax_title'] = isset($invoice) ? $invoice->tax_title : '';

resources/views/success/content.blade.php

@@ -37,7 +37,7 @@
                         <div class="section-3">
                             @if ($type == 1)
                                 <a class="btn btn-success" href="/change/{{ $order_info->order_id }}">审核订单</a>
-                                @if ($is_quiry)
+                                @if (!$is_quiry)
                                     <a class="btn btn-default" href="/add_order">继续新增</a>
                                 @endif
                             @elseif ($type == 2)