12.18

luodangjia

2025-01-24 c90a8ac772937f8f084356ea1f04c5dba1d9e5d5

 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();