Merge branch 'zjl_adjust_20180910' into development

app/Http/Controllers/OrderController.php

@@ -227,22 +227,21 @@ function getOrderSource($order_id, $order_type=1)
                 case 1: 
                 case 1: 
                 case 2: 
                 case 2: 
                 case 3: 
                 case 3: 
-                    $source = '后台';
-                    break;
-                case 0:
-                    $order_source = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->select('order_source')->first();
-
-                    if (preg_match('/pf=1/', $order_source->order_source)) {
-                        $source = 'PC端';
-                    } else if (preg_match('/pf=2/', $order_source->order_source)) {
-                        $source = '移动端';
-                    } else {
-                        $source = '未知';
-                    }
+                    return '后台';               
             }
             }
+        }
+
+        $order_source = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->select('order_source')->first();
 
 
-            return $source;
+        if (preg_match('/pf=1/', $order_source->order_source)) {
+            $source = 'PC端';
+        } else if (preg_match('/pf=2/', $order_source->order_source)) {
+            $source = '移动端';
+        } else {
+            $source = '未知';
         }
         }
+
+        return $source;
     } else if ($order_type == 3) {
     } else if ($order_type == 3) {
         return '京东';
         return '京东';
     }
     }