Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_order_source_20180904

app/Http/Controllers/AddOrderController.php

@@ -293,7 +293,7 @@ Class AddOrderController extends Controller
             $response = json_decode(curlApi($url, $data, 'POST'), true); 
             $response = json_decode(curlApi($url, $data, 'POST'), true); 
 
 
             if (!empty($response['data']['data'])) {
             if (!empty($response['data']['data'])) {
-                return ['errcode' => 0, 'errmsg' => '', 'data' => $response['data']['data'][0]];
+                return ['errcode' => 0, 'errmsg' => '', 'data' => $response['data']['data'][$data['sku_id']]];
             } else {
             } else {
                 return ['errcode' => -1, 'errmsg' => '未找SKU信息'];
                 return ['errcode' => -1, 'errmsg' => '未找SKU信息'];
             }
             }

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 '京东';
     }
     }