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

app/admin/controller/OrderImport.php

@@ -295,6 +295,14 @@ class OrderImport extends Base
 
         $platform_id = $this->request->post('platform_id/d', 0, 'trim');
 
+        $list = Db::name('platform_source')
+            ->field('id,platform_id,source')
+            ->where(['is_del' => 0, 'platform_id' => $platform_id])
+            ->order('id', 'desc')
+            ->select()
+            ->toArray();
+
+        return app_show(0, '获取成功', $list);
 
     }
 

app/admin/route/app.php

@@ -471,4 +471,5 @@ Route::rule('getdata','admin/Data/index');//数据看板，获取相关统计数
 Route::rule('orderimport','admin/OrderImport/import');//C端订单导入
 Route::rule('orderimportlist','admin/OrderImport/getImportList');//C端订单列表
 Route::rule('orderimportinfo','admin/OrderImport/getImportInfo');//C端订单详情
-Route::rule('getonlinegoodinfo','admin/OrderImport/getOnlineGoodInfoByPlatcode');//获取线上商品详情
+Route::rule('getonlinegoodinfo','admin/OrderImport/getOnlineGoodInfoByPlatcode');//获取线上商品详情
+Route::rule('getsourcedata','admin/OrderImport/getSourceDataByPlatformId');//获取销售渠道备选数据