Merge branch 'zjl_order_perm_20181024'

app/Http/Controllers/AddOrderController.php

@@ -289,11 +289,18 @@ Class AddOrderController extends Controller
         if ($request->isMethod('post')) {
         if ($request->isMethod('post')) {
             $url = Config('website.search-skuid');
             $url = Config('website.search-skuid');
             $data['sku_id'] = $request->input('sku_id');
             $data['sku_id'] = $request->input('sku_id');
+            $goods_type = $request->input('goods_type');
             
             
             $response = json_decode(curlApi($url, $data, 'POST'), true); 
             $response = json_decode(curlApi($url, $data, 'POST'), true); 
 
 
-            if (!empty($response['data']['data'])) {
-                return ['errcode' => 0, 'errmsg' => '', 'data' => $response['data']['data'][$data['sku_id']]];
+            if ($goods_type == 1) {
+                $goods_info = $response['data']['sku'];
+            } else {
+                $goods_info = $response['data'];
+            }
+            
+            if (!empty($goods_info)) {
+                return ['errcode' => 0, 'errmsg' => '', 'data' => $goods_info];
             } else {
             } else {
                 return ['errcode' => -1, 'errmsg' => '未找SKU信息'];
                 return ['errcode' => -1, 'errmsg' => '未找SKU信息'];
             }
             }