From 5405154d6979f1b50ce2d881bb164b1acca80b6d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 一月 2021 18:58:18 +0800
Subject: [PATCH] 修改相关bug
---
service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityDetailVOFactory.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityDetailVOFactory.java b/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityDetailVOFactory.java
index 6e18924..f30628c 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityDetailVOFactory.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityDetailVOFactory.java
@@ -41,8 +41,8 @@
vo.setHelpLink(helpLink);
vo.setAssistCount(assistCount);
vo.setSponsorActivityCount(sponsorActivityCount <= 1 ? 0 : sponsorActivityCount - 1);
- if (dto.getActivity().getActualOpenTime() != null) {
- vo.setActualOpenDate(TimeUtil.getGernalTime(dto.getActivity().getActualOpenTime().getTime(), "yyyy.MM.dd HH:mm"));
+ if (dto.getActivity().getOpenInfo().getActualOpenTime() != null) {
+ vo.setActualOpenDate(TimeUtil.getGernalTime(dto.getActivity().getOpenInfo().getActualOpenTime().getTime(), "yyyy.MM.dd HH:mm"));
}
return vo;
@@ -65,9 +65,12 @@
bean.setId(activity.getId());
//璁剧疆浜嗛璁＄粨鏉熸椂闂�
if (activity.getPreFinishTime() != null) {
- long leftTime = activity.getPreFinishTime().getTime() - System.currentTimeMillis();
- if (leftTime < 0) {
- leftTime = 0L;
+ long leftTime = 0;
+ if (activity.getState() == LuckyActivity.STATE_STARTED) {
+ leftTime = activity.getPreFinishTime().getTime() - System.currentTimeMillis();
+ if (leftTime < 0) {
+ leftTime = 0L;
+ }
}
bean.setLeftTime(leftTime);
}
@@ -83,7 +86,7 @@
}
bean.setSponsor(ActivityListItemInfoVOFactory.create(activity.getSponsorInfo().getSponsors()));
bean.setSponsorAd(create(activity.getSponsorInfo()));
- bean.setDateNumber("娲诲姩鏈熷彿锛�" + ActivityUtil.getActivityDateNumber(activity.getId()));
+ bean.setDateNumber("娲诲姩鏈熷彿锛�" + ActivityUtil.getActivityDateNumber(activity.getId(), activity.getCreateTime()));
return bean;
}
@@ -102,7 +105,7 @@
bean.setConditions(conditions);
bean.setConditionsDesc(descList);
- bean.setMarks("娉細绯荤粺灏嗕細鐢盶"鏀粯瀹濋椤�-鏈嶅姟鎻愰啋\"缁欑敤鎴蜂笅鍙戞槸鍚︿腑濂栨彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掗啋娑堟伅鎻愰啋閱掓秷鎭彁閱掗啋娑堟伅鎻愰啋閱�");
+ bean.setMarks(sponsorInfo.getAd().getDesc());
}
return bean;
@@ -117,7 +120,7 @@
}
conditions.add(String.format("鍙備笌鑰呭埌杈�%s浜鸿嚜鍔ㄥ紑濂�", openInfo.getMinPersonCount()));
bean.setConditions(conditions);
- bean.setMarks("娉細绯荤粺灏嗕細鐢盶"鏀粯瀹濋椤�-鏈嶅姟鎻愰啋\"缁欑敤鎴蜂笅鍙戞槸鍚︿腑濂栨彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掗啋娑堟伅鎻愰啋閱�...\n");
+ bean.setMarks(openInfo.getRemarks());
return bean;
}
--
Gitblit v1.8.0