Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/OrderImport.php

@@ -337,14 +337,14 @@ class OrderImport extends Base
 
             //商品信息
             if (!empty($good_platform_info)) {
-                $extend_insert_data['spuCode'] = $good_platform_info['spuCode'];
+                $extend_insert_data['skuCode'] = $good_platform_info['skuCode'];
                 $extend_insert_data['platform_codes'] = $good_platform_info['platform_code'];
                 $extend_insert_data['plat_code'] = $good_platform_info['plat_code'];
 
                 $good_info = Db::name('good')
                     ->field('good_name,companyNo,supplierNo')
                     ->where(['is_del' => 0])
-                    ->where('spuCode', $extend_insert_data['spuCode'])
+                    ->where('spuCode', $good_platform_info['spuCode'])
                     ->find();
                 if (!empty($good_info)) {
                     $extend_insert_data['companyNo'] = $good_info['companyNo'];