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

app/admin/controller/OrderImport.php

@@ -293,7 +293,7 @@ class OrderImport extends Base
             ->where(['spuCode'=> $info['spuCode'],'wsm_code'=>$wsm_code,'is_del'=>0])
             ->value('usable_stock',0);
 
-        if($usable_stock<$num) return error_show(1005,'可用库存只有'.$usable_stock);
+        if($usable_stock<$num) return error_show(1005,'可用库存只有'.$usable_stock.',库存不足，关联失败');
         else {
 
             $userinfo = GetUserInfo($this->post['token']);
@@ -330,7 +330,7 @@ class OrderImport extends Base
         }
         $plat = Db::name("platform")->where(["id" => $good_platform['platform_code']])->find();
         $data['skuCode'] = $good_platform['skuCode'];
-        $data['platform_code'] = $good_platform['id'];
+        $data['platform_code'] = $good_platform['platform_code'];
         $data['platform_code_en'] = isset($plat['platform_code']) ? $plat['platform_code'] : "";
         $data['platform_name'] = isset($plat['platform_name']) ? $plat['platform_name'] : "";
         $data['online_reason'] = $good_platform['online_reason'];