岐济生
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2025-01-14 6ccd0f9e28c083e5f62d7d5074a85584a77af6bb 
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java


@@ -62,9 +62,10 @@


      if (org.springframework.util.StringUtils.hasLength(orderActivityInfo.getVipIds())){


         List<String> vipIds = new ArrayList<>(Arrays.asList(orderActivityInfo.getVipIds().split(",")));


         List<OrderActivityInfo> list = orderActivityInfoService.lambdaQuery()


               .le(OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime())


               .between(OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime(), orderActivityInfo.getEndTime())


               .or()


               .ge(OrderActivityInfo::getEndTime, orderActivityInfo.getEndTime()).list();


               .between(OrderActivityInfo::getEndTime, orderActivityInfo.getStartTime(), orderActivityInfo.getEndTime())


               .list();


         if (!list.isEmpty()){


            for (OrderActivityInfo activityInfo : list) {


               List<String> vips = Arrays.asList(activityInfo.getVipIds().split(","));


@@ -132,9 +133,12 @@


      if (org.springframework.util.StringUtils.hasLength(orderActivityInfo.getVipIds())){


         List<String> vipIds = new ArrayList<>(Arrays.asList(orderActivityInfo.getVipIds().split(",")));


         List<OrderActivityInfo> list = orderActivityInfoService.lambdaQuery()


               .le(OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime())


               .between(OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime(), orderActivityInfo.getEndTime())


               .or()


               .ge(OrderActivityInfo::getEndTime, orderActivityInfo.getEndTime()).list();


               .between(OrderActivityInfo::getEndTime, orderActivityInfo.getStartTime(), orderActivityInfo.getEndTime())


               .list();


         // 遍历集合 通过startTime和endTime 判断是否与当前活动时间重叠




         if (!list.isEmpty()){


            for (OrderActivityInfo activityInfo : list) {


               List<String> vips = Arrays.asList(activityInfo.getVipIds().split(","));


@@ -196,6 +200,7 @@


            .gt(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 0, OrderActivityInfo::getStartTime, LocalDateTime.now())


            .ge(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 1, OrderActivityInfo::getEndTime, LocalDateTime.now())


            .lt(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 1, OrderActivityInfo::getStartTime, LocalDateTime.now())


            .lt(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 2, OrderActivityInfo::getEndTime, LocalDateTime.now())


            .eq(orderActivityInfo.getIsShelf() != null, OrderActivityInfo::getIsShelf, orderActivityInfo.getIsShelf()).orderByDesc(OrderActivityInfo::getCreateTime)


            .orderByDesc(OrderActivityInfo::getCreateTime))


            ;