bug修改

huliguo

1 天以前 d617e84caebaf2e7aa09c55cb2bd89c5a23ef8ac

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java

@@ -265,6 +265,8 @@
            .eq(TLotteryEvent::getActivityType, dto.getActivityType())//类型相同的
            .between(TLotteryEvent::getStartTime, dto.getStartTime(), dto.getEndTime())//开始时间在这个活动的（开始-结束）范围内的
            .or()
            .eq(TLotteryEvent::getDelFlag, 0)//未删除的
            .eq(TLotteryEvent::getActivityType, dto.getActivityType())//类型相同的
            .between(TLotteryEvent::getEndTime, dto.getStartTime(), dto.getEndTime())//结束时间在这个活动的（开始-结束）范围内的
      );
      if (null != lotteryEvents && !lotteryEvents.isEmpty()) {
@@ -482,6 +484,7 @@
      //1.奖品数据删除
/*      lotteryEventPrizeService.remove(new LambdaQueryWrapper<TLotteryEventPrize>()
            .eq(TLotteryEventPrize::getLotteryEventId,lotteryEvent.getId()));*/
		
      lotteryEventPrizeService.deleteByLotteryEventId(lotteryEvent.getId());
      //2.答题类型
      if (lotteryEvent.getActivityType().equals(5)) {