Merge branch 'zjl_field_20211023' into development

app/Http/Controllers/OrderController.php

@@ -18,6 +18,7 @@ use App\Model\CmsModel;
 use App\Model\QueuedModel;
 use App\Model\OrderModel;
 use App\Model\OrderExtendModel;
+use App\Model\OrderContractModel;
 use App\Model\OrderPriceModel;
 use App\Model\OrderAddressModel;
 use App\Model\OrderActionLogModel;
@@ -1748,6 +1749,7 @@ Class OrderController extends Controller
             'order_pay_log'               => $temp['data']['order_pay_log'],
             'order_price_info'            => $temp['data']['order_price_info'],
             'order_temp_info'             => $temp['data']['order_temp_info'],
+            'order_contract_info'         => $temp['data']['order_contract_info'],
             'order_shipping_inside'       => $temp['data']['order_shipping_inside'],
             'actionLog'                   => $actionLog,
             'erpPayLog'                   => $erpPayLog,
@@ -2108,7 +2110,7 @@ Class OrderController extends Controller
             $data['contract_link_tel']  = $request->input('contract_link_tel', '');
 
             DB::connection('order')->transaction(function() use ($request, $order_id, $data) {
-                OrderExtendModel::where('order_id', $order_id)->update($data);
+                OrderContractModel::updateOrCreate(['order_id' => $order_id], $data);
 
                 $OrderActionLogModel = new OrderActionLogModel();
                 $OrderActionLogModel->addLog($order_id, $request->user->userId, 2, '编辑合同乙方信息'); // 操作记录       
@@ -2127,7 +2129,7 @@ Class OrderController extends Controller
 
             DB::connection('order')->transaction(function() use ($request, $order_id, $data) {
                 OrderModel::where('order_id', $order_id)->update(['erp_syn'=>1]); // 标记ERP同步
-                OrderExtendModel::where('order_id', $order_id)->update($data);
+                OrderContractModel::updateOrCreate(['order_id' => $order_id], $data);
 
                 $OrderActionLogModel = new OrderActionLogModel();
                 $OrderActionLogModel->addLog($order_id, $request->user->userId, 2, '回传合同'); // 操作记录       

app/Model/OrderContractModel.php

+<?php
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+use DB;
+
+class OrderContractModel extends Model
+{
+    protected $connection = 'order';
+    protected $table      = 'lie_order_contract';
+    protected $primaryKey = 'sc_id';
+    protected $guarded    = ['sc_id'];
+    public $timestamps    = false;
+
+    
+
+}
\ No newline at end of file

resources/views/detail/content.blade.php

@@ -31,11 +31,11 @@
         </div>
         
         <?php 
-            if ($order_temp_info['contract_com_name']) {
-                $contract_com_name  = $order_temp_info['contract_com_name'];
-                $contract_com_addr  = $order_temp_info['contract_com_addr'];
-                $contract_link_name = $order_temp_info['contract_link_name'];
-                $contract_link_tel  = $order_temp_info['contract_link_tel'];
+            if ($order_contract_info['contract_com_name']) {
+                $contract_com_name  = $order_contract_info['contract_com_name'];
+                $contract_com_addr  = $order_contract_info['contract_com_addr'];
+                $contract_link_name = $order_contract_info['contract_link_name'];
+                $contract_link_tel  = $order_contract_info['contract_link_tel'];
             } else { // 若未填写乙方信息，则拉取相关数据
                 // 公司名称
                 if (isset($order_invoice_info['tax_title']) && $order_invoice_info['tax_title'])