From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/IntroduceRewardsServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/IntroduceRewardsServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/IntroduceRewardsServiceImpl.java
index 4919961..ccbf976 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/IntroduceRewardsServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/IntroduceRewardsServiceImpl.java
@@ -4,9 +4,12 @@
import com.dsh.activity.entity.IntroduceRewards;
import com.dsh.activity.mapper.IntroduceRewardsMapper;
import com.dsh.activity.model.IntroduceChangeStateDTO;
+import com.dsh.activity.model.IntroduceQuery;
+import com.dsh.activity.model.IntroduceVO;
import com.dsh.activity.service.IntroduceRewardsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.util.List;
@@ -22,10 +25,23 @@
public class IntroduceRewardsServiceImpl extends ServiceImpl<IntroduceRewardsMapper, IntroduceRewards> implements IntroduceRewardsService {
@Autowired
private IntroduceRewardsMapper introduceRewardsMapper;
+
@Override
public Object changeState(IntroduceChangeStateDTO dto) {
List<Integer> ids = dto.getIds();
Integer state = dto.getState();
- return introduceRewardsMapper.changeState(ids,state);
+ return introduceRewardsMapper.changeState(ids, state);
+ }
+
+ @Override
+ public List<IntroduceVO> listAll(IntroduceQuery query) {
+
+ String STime = null;
+ String ETime = null;
+ if (StringUtils.hasLength(query.getTime())) {
+ STime = query.getTime().split(" - ")[0] + " 00:00:00";
+ ETime = query.getTime().split(" - ")[1] + " 23:59:59";
+ }
+ return introduceRewardsMapper.listAll(query, STime, ETime);
}
}
--
Gitblit v1.7.1