|
|
@@ -283,12 +283,15 @@ class Activity extends Base
|
|
|
$ist =Db::name("good_activity")->alias("a")
|
|
|
->leftJoin("activity_info b","a.activity_code = b.activity_code and b.is_del=0")
|
|
|
->where(["b.skuCode"=>$skuCode,"a.is_del"=>0])->where([["a.status","<>",8],["start|end","between",
|
|
|
- [$activity_start,$activity_end]]])->findOrEmpty();
|
|
|
+ [$activity_start,$activity_end]]])->select()->toArray();
|
|
|
if(!empty($ist)){
|
|
|
Db::rollback();
|
|
|
- return app_show(1005,'活动商品已存在',["活动 ".$ist['activity_name']. '已存在商品'. $ist['good_name']]);
|
|
|
+ $limit=[];
|
|
|
+ foreach ($ist as $value){
|
|
|
+ $limit[]="活动 ".$value['activity_name']. ' 已存在商品 '. $value['good_name'];
|
|
|
+ }
|
|
|
+ return app_show(1007,'活动商品已存在', $limit);
|
|
|
}
|
|
|
-
|
|
|
foreach ($good_list as $value){
|
|
|
$lemp=[];
|
|
|
$good = Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")
|
