|
|
@@ -282,8 +282,10 @@ class Activity extends Base
|
|
|
$skuCode =array_column($good_list,"skuCode");
|
|
|
$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]]])->select()->toArray();
|
|
|
+ ->where(["b.skuCode"=>$skuCode,"a.is_del"=>0])->where([["a.status","<>",8]])->where(function
|
|
|
+ ($query)use($activity_end,$activity_start){
|
|
|
+ return $query->whereOr([["start&end",">=",$activity_end],["start&end","<=",$activity_start]]);
|
|
|
+ })->select()->toArray();
|
|
|
if(!empty($ist)){
|
|
|
Db::rollback();
|
|
|
$limit=[];
|
