|
@@ -321,7 +321,7 @@ class Activity extends Base
|
|
|
}
|
|
|
foreach ($good_list as $value){
|
|
|
$lemp = [];
|
|
|
- if ($platform['platform_type'] == 1) $good = Db::name('good')->alias("a")->leftJoin("platform_youzan b", "a.spuCode=b.spuCode")->where(["skuCode" => $value['skuCode'], "a.is_del" => 0])->findOrEmpty(); //有赞使用
|
|
|
+ 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();
|
|
|
|
|
|
$lemp['skuCode']=$value['skuCode'];
|
|
@@ -544,7 +544,7 @@ class Activity extends Base
|
|
|
}
|
|
|
$activity = Db::name("good_activity")
|
|
|
->alias('ga')
|
|
|
- ->field('ga.*,p.platform_name')
|
|
|
+ ->field('ga.*,p.platform_name,p.platform_type')
|
|
|
->leftJoin('platform p', 'p.id=ga.platform_code AND p.is_del=0')
|
|
|
->where(["ga.activity_code" => $activity_code, "ga.is_del" => 0])
|
|
|
->find();
|