Merge branch 'zjl_create_order_20180813' into development

app/Http/Controllers/OrderController.php

@@ -931,7 +931,7 @@ Class OrderController extends Controller
     {
     {
         $data = $this->orderDetail($request, $id);
         $data = $this->orderDetail($request, $id);
 
 
-        if ($data['order_info']['order_goods_type'] == 2) {
+        if ($data['order_info']['order_goods_type'] == 2 && $data['order_info']['order_type'] == 1) { // 平台自营订单
             if ($request->input('tags') != 'self') {
             if ($request->input('tags') != 'self') {
                return redirect('self_order');  // URL重定向
                return redirect('self_order');  // URL重定向
             } else {
             } else {