Merge branch 'zjl_exception_20181221' into development

app/Http/Controllers/OrderController.php

@@ -527,11 +527,6 @@ Class OrderController extends Controller
         if ($request->isMethod('post')) {
             $order_id = $request->input('order_id'); 
 
-            if (!$actionLog){
-                errorLog(Error::E_ADD_FAILED, '添加操作记录失败');
-                return ['errcode'=>Error::E_ADD_FAILED, 'errmsg'=>'添加操作记录失败'];
-            } 
-
             $apiUrl = Config('website.api_domain');
             $k1  = time();
             $k2  = md5(md5($k1).'fh6y5t4rr351d2c3bryi');
@@ -541,6 +536,11 @@ Class OrderController extends Controller
             $OrderActionLogModel = new OrderActionLogModel();
             $actionLog = $OrderActionLogModel->addLog($order_id, $request->user->userId, 2, '下载合同');
 
+            if (!$actionLog){
+                errorLog(Error::E_ADD_FAILED, '添加操作记录失败');
+                return ['errcode'=>Error::E_ADD_FAILED, 'errmsg'=>'添加操作记录失败'];
+            }
+
             return ['errcode'=>0, 'errmsg'=>'', 'data'=>$downLoadUrl];
         }
     }