From d0b043b8fa5f19d1295cac50fece0c65fceb3920 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 17:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
index f75ff29..0060cb9 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
@@ -138,9 +138,11 @@
.between(OrderActivityInfo::getEndTime, orderActivityInfo.getStartTime(), orderActivityInfo.getEndTime())
.list();
// 遍历集合 通过startTime和endTime 判断是否与当前活动时间重叠
-
if (!list.isEmpty()){
for (OrderActivityInfo activityInfo : list) {
+ if(activityInfo.getId().equals(orderActivityInfo.getId())){
+ continue;
+ }
List<String> vips = Arrays.asList(activityInfo.getVipIds().split(","));
if (!vipIds.isEmpty()){
StringBuilder message = new StringBuilder();
--
Gitblit v1.7.1