From 71d23d994445025d9eaf18c86bbdcf82f632bf83 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 16 六月 2025 09:49:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java
index 219aaed..e9f2e51 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -25,8 +26,23 @@
@Override
public PageInfo<TAdvertising> pageList(AdvertisingDTO dto) {
- PageInfo<TAdvertising> pageInfo = new PageInfo<>(dto.getStartState(),dto.getPageSize());
+ PageInfo<TAdvertising> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
List<TAdvertising> list = this.baseMapper.pageList(pageInfo,dto);
+ for (TAdvertising tAdvertising : list) {
+ // 如果开始时间大于当前时间 那么设置状态startState为1 未开始
+ if (tAdvertising.getStartTime().isAfter(LocalDateTime.now())) {
+ tAdvertising.setStartState(1);
+ } else if (tAdvertising.getEndTime().isBefore(LocalDateTime.now())) {
+ tAdvertising.setStartState(3);
+ } else {
+ tAdvertising.setStartState(2);
+ }
+ if (tAdvertising.getStatus() == 0 ){
+ // 未上架
+ tAdvertising.setStartState(3);
+
+ }
+ }
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1