|
|
@@ -71,6 +71,7 @@ public class PromotionActivityServiceImpl extends ServiceImpl<BaseMapper<Promoti
|
|
|
LambdaQueryWrapper<PromotionActivity> w = new LambdaQueryWrapper<>();
|
|
|
w.eq(PromotionActivity::getStoreId, activity.getStoreId())
|
|
|
.eq(PromotionActivity::getType, activity.getType())
|
|
|
+ .ne(PromotionActivity::getStatus, 2) // 排除已结束/已停止,允许在其原时段重新建促销
|
|
|
.le(PromotionActivity::getStartTime, activity.getEndTime())
|
|
|
.ge(PromotionActivity::getEndTime, activity.getStartTime());
|
|
|
if (excludeId != null)
|