合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java

@@ -111,11 +111,11 @@
            LocalDateTime now = LocalDateTime.now();
            LocalDateTime endTime = record.getEndTime();
            if (endTime.isBefore(now)){
                record.setStatus(2); //已结束
                record.setStatus(3); //已结束
            }else if (startTime.isBefore(now)){
                record.setStatus(1); // 已开始
                record.setStatus(2); // 已开始
            }else {
                record.setStatus(0); // 未开始
                record.setStatus(1); // 未开始
            }
        }
        return R.ok(IPage);