Merge branch 'zjl_create_order_20180813' into development

app/Http/Controllers/AddOrderController.php

@@ -532,9 +532,20 @@ Class AddOrderController extends Controller
 
 
                 $event = '自营线下订单审核通过';
                 $event = '自营线下订单审核通过';
             } else {
             } else {
-               $update = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->update(['status' => $status, 'cancel_time' => time()]); // 订单取消状态 
+                $data['order_id'] = $request->input('order_id');
+                $data['operator_id'] = $request->user->userId;
+                $data['cancel_reason'] = '后台审核不通过';
+
+                $url = Config('website.api_domain').'order/selfCancel';
+
+                $data['k1']  = time();
+                $data['k2']  = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
+                
+                $temp = json_decode(curlApi($url, $data, "POST"), true);
 
 
                 $event = '自营线下订单审核不通过';
                 $event = '自营线下订单审核不通过';
+
+                return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']);
             }  
             }  
             
             
             // 操作记录
             // 操作记录