|
@@ -238,8 +238,6 @@ class Activity extends Base
|
|
|
if($platform_code==""){
|
|
|
return error_show(1004,"参数platform_code不能为空");
|
|
|
}
|
|
|
- $platform = Db::name('platform')->where('id',$platform_code)->findOrEmpty();
|
|
|
- if(empty($platform)) return error_show(1004,'改平台不存在');
|
|
|
|
|
|
$company_id = isset($this->post['company_id'])&&$this->post['company_id']!="" ? trim($this->post['company_id']):"";
|
|
|
if($company_id==""){
|
|
@@ -321,8 +319,7 @@ class Activity extends Base
|
|
|
}
|
|
|
foreach ($good_list as $value){
|
|
|
$lemp = [];
|
|
|
- if ($platform['platform_type'] == 1) $good = Db::name('good_basic')->alias("a")->leftJoin("platform_youzan b", "a.spuCode=b.spuCode")->field('good_name,spuCode')->where(["skuCode" => $value['skuCode'], "a.is_del" => 0])->findOrEmpty(); //有赞使用
|
|
|
- else $good = Db::name('good')->alias("a")->leftJoin("good_platform b", "a.spuCode=b.spuCode")->where(["skuCode" => $value['skuCode'], "a.is_del" => 0])->findOrEmpty();
|
|
|
+ $good = Db::name('good')->alias("a")->leftJoin("good_platform b", "a.spuCode=b.spuCode")->where(["skuCode" => $value['skuCode'], "a.is_del" => 0])->findOrEmpty();
|
|
|
|
|
|
$lemp['skuCode']=$value['skuCode'];
|
|
|
$lemp['good_name']=isset($good['good_name']) ?$good['good_name']:"" ;
|