From 1663c55b246cd257244c47c0ae36e3335c14f95d Mon Sep 17 00:00:00 2001
From: heshupeng <hsp@bronet.cn>
Date: Fri, 25 Dec 2020 14:28:04 +0800
Subject: [PATCH] 活动显示
---
addons/shopro/library/traits/ActivityCache.php | 4 ++--
addons/shopro/model/Goods.php | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/addons/shopro/library/traits/ActivityCache.php b/addons/shopro/library/traits/ActivityCache.php
index e61b07a..f53dadf 100644
--- a/addons/shopro/library/traits/ActivityCache.php
+++ b/addons/shopro/library/traits/ActivityCache.php
@@ -130,7 +130,7 @@ trait ActivityCache
continue;
}
} else if ($status == 'nostart') {
- if (time() > $starttime || $tomorrow_start < $endtime) {
+ if (time() > $starttime || $tomorrow_start < $starttime) {
continue;
}
} else if ($status == 'ended') {
@@ -138,7 +138,7 @@ trait ActivityCache
continue;
}
} else if ($status == 'tomorrow') {
- if ($tomorrow_start > $starttime || $tomorrow_end < $endtime) {
+ if ($tomorrow_start > $starttime || $tomorrow_end < $starttime) {
continue;
}
}
diff --git a/addons/shopro/model/Goods.php b/addons/shopro/model/Goods.php
index 729fd25..4d6643d 100644
--- a/addons/shopro/model/Goods.php
+++ b/addons/shopro/model/Goods.php
@@ -205,7 +205,7 @@ class Goods extends Model
];
}else{ //下一场
$where['starttime'] = ['>', time()];
- $where['endtime'] = ['<', $tomorrow_start];
+ $where['starttime'] = ['<', $tomorrow_start];
$activity = Activity::where($where)->order('starttime')->find();
if($activity){
$type = 'nostart';
@@ -215,7 +215,7 @@ class Goods extends Model
];
}else{ //明日预告
$where['starttime'] = ['>', $tomorrow_start];
- $where['endtime'] = ['<', $tomorrow_end];
+ $where['starttime'] = ['<', $tomorrow_end];
$activity = Activity::where($where)->order('starttime')->find();
$type = 'tomorrow';
}
@@ -257,7 +257,7 @@ class Goods extends Model
];
}else{ //下一场
$where['starttime'] = ['>', time()];
- $where['endtime'] = ['<', $tomorrow_start];
+ $where['starttime'] = ['<', $tomorrow_start];
$activity = Activity::where($where)->order('starttime')->find();
if($activity){
$type = 'nostart';
@@ -267,7 +267,7 @@ class Goods extends Model
];
}else{ //明日预告
$where['starttime'] = ['>', $tomorrow_start];
- $where['endtime'] = ['<', $tomorrow_end];
+ $where['starttime'] = ['<', $tomorrow_end];
$activity = Activity::where($where)->order('starttime')->find();
$type = 'tomorrow';
}
@@ -302,12 +302,12 @@ class Goods extends Model
$where['endtime'] = ['>', time()];
} else if ($type == 'nostart') {
$where['starttime'] = ['>', time()];
- $where['endtime'] = ['<', $tomorrow_start];
+ $where['starttime'] = ['<', $tomorrow_start];
} else if ($type == 'ended') {
$where['endtime'] = ['<', time()];
} else if ($type == 'tomorrow') {
$where['starttime'] = ['>', $tomorrow_start];
- $where['endtime'] = ['<', $tomorrow_end];
+ $where['starttime'] = ['<', $tomorrow_end];
}
$activityList = Activity::where($where)->select();
@@ -348,12 +348,12 @@ class Goods extends Model
$where['endtime'] = ['>', time()];
} else if ($type == 'nostart') {
$where['starttime'] = ['>', time()];
- $where['endtime'] = ['<', $tomorrow_start];
+ $where['starttime'] = ['<', $tomorrow_start];
} else if ($type == 'ended') {
$where['endtime'] = ['<', time()];
} else if ($type == 'tomorrow') {
$where['starttime'] = ['>', $tomorrow_start];
- $where['endtime'] = ['<', $tomorrow_end];
+ $where['starttime'] = ['<', $tomorrow_end];
}
$activityList = Activity::where($where)->select();
--
libgit2 0.24.0