From 530c09f7b74bf21c0e9b464f3511936792d7f96a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 15:54:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 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 ace718e..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
@@ -1,10 +1,16 @@
package com.ruoyi.other.service.impl;
-import com.ruoyi.other.model.TAdvertising;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.other.api.domain.TAdvertising;
+import com.ruoyi.other.api.domain.TVip;
+import com.ruoyi.other.api.dto.AdvertisingDTO;
import com.ruoyi.other.mapper.TAdvertisingMapper;
import com.ruoyi.other.service.TAdvertisingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -17,4 +23,27 @@
@Service
public class TAdvertisingServiceImpl extends ServiceImpl<TAdvertisingMapper, TAdvertising> implements TAdvertisingService {
+ @Override
+ public PageInfo<TAdvertising> pageList(AdvertisingDTO dto) {
+
+ 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