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

app/admin/controller/OrderImport.php

@@ -529,7 +529,16 @@ class OrderImport extends Base
         if ($plat_code == "") {
             return error_show(1005, "参数plat_code不能为空");
         }
-        $good_platform = Db::name("good_platform")->where(['plat_code' => $plat_code, "is_del" => 0])->find();
+
+        $where = [['plat_code', '=', $plat_code]];
+        $platform_id = isset($this->post['platform_id']) && $this->post['platform_id'] != "" ? intval($this->post['platform_id']) : "";
+        if ($platform_id != '') $where[] = ['platform_code', '=', $platform_id];
+
+        $good_platform = Db::name("good_platform")
+            ->where($where)
+            ->where(['is_del' => 0])
+            ->find();
+        
         if ($good_platform == false) {
             return error_show(1004, "未找到商品数据");
         }