Merge branch 'zjl_order_20200923'

app/Http/Controllers/ApiController.php

@@ -380,15 +380,23 @@ class ApiController extends Controller
         $OrderExtendModel = new OrderExtendModel;
         $OrderActionLogModel = new OrderActionLogModel;
 
-        $old_erp_sn = $OrderExtendModel->where('order_id', $order_id)->value('erp_sn');
+        $order_extend = $OrderExtendModel->where('order_id', $order_id)->first();
 
-        $res = $OrderExtendModel->where('order_id', $order_id)->update(['erp_sn' => $erp_sn]);
+        if (!$order_extend) {
+            $res = $OrderExtendModel->insert(['order_id' => $order_id, 'erp_sn' => $erp_sn]);
+
+            $OrderActionLogModel->addLog($order_id, $request->user->userId, 2, '编辑ERP单号，添加订单扩展表');
+        } else {
+            $res = $OrderExtendModel->where('order_id', $order_id)->update(['erp_sn' => $erp_sn]);
+
+            $OrderActionLogModel->addLog($order_id, $request->user->userId, 2, '编辑ERP单号，修改前：'.$order_extend->erp_sn);
+        }
 
         if ($res === false) {
             $this->Export(-1, '编辑ERP单号失败');
         }
 
-        $OrderActionLogModel->addLog($order_id, $request->user->userId, 2, '编辑ERP单号，修改前：'.$old_erp_sn);
+        
 
         $this->Export(0, '编辑ERP单号成功');
     }