Merge branch 'zjl_adjust_20180910' into development

app/Http/Controllers/OrderController.php

@@ -227,9 +227,10 @@ function getOrderSource($order_id, $order_type=1)
                 case 1: 
                 case 1: 
                 case 2: 
                 case 2: 
                 case 3: 
                 case 3: 
-                    $source = '后台';
-                    break;
-                case 0:
+                    return '后台';               
+            }
+        }
+
         $order_source = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->select('order_source')->first();
         $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)) {
         if (preg_match('/pf=1/', $order_source->order_source)) {
@@ -239,10 +240,8 @@ function getOrderSource($order_id, $order_type=1)
         } else {
         } else {
             $source = '未知';
             $source = '未知';
         }
         }
-            }
 
 
         return $source;
         return $source;
-        }
     } else if ($order_type == 3) {
     } else if ($order_type == 3) {
         return '京东';
         return '京东';
     }
     }