From 6c09cbd70388ae53ec593de253f69cfa1a3eeda7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 06 二月 2021 15:41:25 +0800
Subject: [PATCH] 活动管理界面完善
---
service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityAdminVoFactory.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityAdminVoFactory.java b/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityAdminVoFactory.java
index 42f31dc..7a104f6 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityAdminVoFactory.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityAdminVoFactory.java
@@ -2,9 +2,11 @@
import com.ks.daylucky.pojo.DO.ActivityTag;
import com.ks.daylucky.pojo.VO.admin.ActivityAdminVo;
+import com.ks.daylucky.util.activity.ActivityUtil;
import com.ks.lucky.pojo.DO.*;
import com.ks.lucky.pojo.DTO.ActivityAwardParams;
import com.ks.lucky.pojo.DTO.sponsorad.AlipayLifeAdInfo;
+import org.yeshi.utils.TimeUtil;
import java.util.ArrayList;
import java.util.List;
@@ -12,7 +14,7 @@
public class ActivityAdminVoFactory {
- public static ActivityAdminVo create(LuckyActivity activity, List<ActivityTag> tagList,int validDay) {
+ public static ActivityAdminVo create(LuckyActivity activity, List<ActivityTag> tagList, int validDay) {
ActivityAdminVo vo = new ActivityAdminVo();
vo.setActivity(createActivityBean(activity, tagList));
vo.setAwardInfo(createAwardList(activity));
@@ -35,17 +37,40 @@
bean.setBannerList(createBannerList(activity.getBannerList()));
bean.setPoster(activity.getMaterialPoster());
bean.setTags(tagList);
+
+ bean.setCreateTime(TimeUtil.getGernalTime(activity.getCreateTime().getTime(), "yyyy-MM-dd HH:mm"));
+ if (activity.getActualFinishTime() != null) {
+ bean.setActualFinishTime(TimeUtil.getGernalTime(activity.getActualFinishTime().getTime(), "yyyy-MM-dd HH:mm"));
+ }
+ if (activity.getActualStartTime() != null) {
+ bean.setActualStartTime(TimeUtil.getGernalTime(activity.getActualStartTime().getTime(), "yyyy-MM-dd HH:mm"));
+ }
+ bean.setCurrentPersonCount(activity.getCurrentPersonCount());
+ if (activity.getPreFinishTime() != null) {
+ bean.setPreFinishTime(TimeUtil.getGernalTime(activity.getPreFinishTime().getTime(), "yyyy-MM-dd HH:mm"));
+ }
+ bean.setMaxPersonCount(activity.getMaxPersonCount());
+ if (activity.getPreStartTime() != null) {
+ bean.setPreStartTime(TimeUtil.getGernalTime(activity.getPreStartTime().getTime(), "yyyy-MM-dd HH:mm"));
+ }
+ bean.setState(ActivityUtil.getStateDesc(activity.getState()));
+ bean.setStateDesc(activity.getStateRemarks());
+
+ bean.setSerialNo(ActivityUtil.getActivityDateNumber(activity.getId(), activity.getCreateTime()));
+
+
return bean;
}
private static List<ActivityAdminVo.ActivityBean.BannerBean> createBannerList(List<LuckyActivityImage> imageList) {
List<ActivityAdminVo.ActivityBean.BannerBean> beanList = new ArrayList<>();
- for (LuckyActivityImage image : imageList) {
- ActivityAdminVo.ActivityBean.BannerBean bean = new ActivityAdminVo.ActivityBean.BannerBean();
- bean.setId(image.getId());
- bean.setUrl(image.getUrl());
- beanList.add(bean);
- }
+ if (imageList != null)
+ for (LuckyActivityImage image : imageList) {
+ ActivityAdminVo.ActivityBean.BannerBean bean = new ActivityAdminVo.ActivityBean.BannerBean();
+ bean.setId(image.getId());
+ bean.setUrl(image.getUrl());
+ beanList.add(bean);
+ }
return beanList;
}
--
Gitblit v1.8.0