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

app/command/ImportOrderFromCAnalysisData.php

@@ -212,7 +212,7 @@ class ImportOrderFromCAnalysisData extends Command
                 //销售渠道
                 $sale_source_temp = Db::name('platform_source')
                     ->field('id')
-                    ->where(['source' => $rs['sale_source'], 'is_del' => 0])
+                    ->where(['source' => $rs['sale_source'], 'is_del' => 0, 'platform_id' => $rs['platform_id']])
                     ->find();
                 if (empty($sale_source_temp)) {
                     $update_c_data['status'] = OIFCModel::$status_wait_confirm;