Merge branch 'zjl_create_order_20180813' into development

app/Http/Controllers/AddOrderController.php

@@ -337,9 +337,6 @@ Class AddOrderController extends Controller
 
                     DB::beginTransaction();
                     try {
-                        // 待发货状态
-                        $update = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->update(['status' => $status]);  
-
                         // 插入到order_price
                         $price['order_id'] = $order_id;
                         $price['order_sn'] = $orderInfo->order_sn;
@@ -363,6 +360,9 @@ Class AddOrderController extends Controller
 
                         $payLog = DB::connection('order')->table('lie_pay_log')->insert($pay);
 
+                        // 待发货状态
+                        $update = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->update(['status' => $status, 'pay_time' => time()]);
+
                         if ($update && $priceAdd && $payLog) {
                             DB::commit();
                         }
@@ -375,7 +375,7 @@ Class AddOrderController extends Controller
 
                 $event = '自营线下订单审核通过';
             } else {
-               $update = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->update(['status' => $status]); // 订单取消状态 
+               $update = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->update(['status' => $status, 'cancel_time' => time()]); // 订单取消状态 
 
                $event = '自营线下订单审核不通过';
             }