Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Channel.php

@@ -47,7 +47,7 @@ class Channel extends Base{
 		$company = \app\admin\common\User::getIns()->handle("getCodeAndName",["code"=>$param['companyNo']]);
 		if(!isset($company['code'])|| $company['code']!=0) return error_show(1004,"未找到业务公司信息");
 		$comp = $company['data']??[];
-		if($company['companyNo']!=$info['companyNo']){
+		if($param['companyNo']!=$info['companyNo']){
 			$isbind =Db::name("platform_channel")->where(["channel_id"=>$param['id'],"is_del"=>0])->findOrEmpty();
 			if(!empty($isbind)) return error_show(1006,"渠道已绑定平台不可编辑业务公司");
 		}

app/command/SplitSale.php

@@ -46,7 +46,7 @@ class SplitSale extends Command
                     ->alias('a')
                     ->leftJoin('platform b', 'b.id=a.platform_id')
                     ->leftJoin('good_proof c', 'c.id=a.proof_id')
-                    ->field('a.*,b.platform_name,c.proof_url')
+                    ->field('a.*,b.platform_name,b.use_type,c.proof_url')
                     ->where([
                         ['a.is_del', '=', 0],
                         ['a.updatetime', '>=', date('Y-m-d H:i:s', time() - 5 * 60)],
@@ -228,6 +228,7 @@ class SplitSale extends Command
                 'order_type' => $sale['order_type'] ?? 0,
                 'order_source' => $this->order_source,
                 'platform_id' => $sale['platform_name'] ?? '',
+                'platform_type' => $sale['use_type'] ?? '',
                 'good_code' => $sale['good_code'] ?? '',
                 'cat_id' => $sale['cat_id'] ?? 0,
                 'cat_name' => json_encode($this->_get_cat_list($sale['cat_id']), JSON_UNESCAPED_UNICODE),
@@ -327,7 +328,7 @@ class SplitSale extends Command
                 'companyNo' => $pay_rate['companyNo'],
                 'companyName' => $pay_rate['companyName'],
                 'supplierNo' => $sale['supplierNo'],
-                'supplier_name' => $sale['supplier_name'],
+                'supplier_name' => $sale['supplierName'],
                 'bktime' => $cgd['bktime'] ?? '',
                 'bkcreater' => $cgd['bkcreater'] ?? '',
                 'noble_metal' => $sale['noble_metal'] ?? '',