From df4441322e9801c102299451da41d7c40b4502e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 六月 2021 18:53:13 +0800
Subject: [PATCH] zookeeper地址修改,Maven采用私服

---
 service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityDetailVOFactory.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 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..9e37809 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;
@@ -50,7 +50,7 @@
 
 
     public static LabelVO create(ActivityTag tag) {
-        LabelVO vo = new LabelVO(tag.getTagName(), tag.getTagBgColor(), tag.getTagFontColr());
+        LabelVO vo = new LabelVO(tag.getTagName(), tag.getTagBgColor(), tag.getTagFontColor());
         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;
     }
 
@@ -97,12 +100,15 @@
             }
 
             List<String> descList = new ArrayList<>();
-            descList.add("鍏虫敞璧炲姪鍟嗙敓娲诲彿銆�");
-            descList.add("鐐硅禐璧炲姪鍟嗙敓娲诲彿鏈�鏂板彂甯冩秷鎭��");
-
+            descList.add("鍏嶈垂鍙備笌鎶藉娲诲姩");
+            if (sponsorInfo.getAd().getAlipayLifeAdInfo().getMustAttention() == null || !sponsorInfo.getAd().getAlipayLifeAdInfo().getMustAttention()) {
+                descList.add("鏃犻渶鍏虫敞鐢熸椿鍙枫��");
+            } else {
+                descList.add("鍏虫敞璧炲姪鍟嗙敓娲诲彿銆�");
+            }
             bean.setConditions(conditions);
             bean.setConditionsDesc(descList);
-            bean.setMarks("娉細绯荤粺灏嗕細鐢盶"鏀粯瀹濋椤�-鏈嶅姟鎻愰啋\"缁欑敤鎴蜂笅鍙戞槸鍚︿腑濂栨彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掗啋娑堟伅鎻愰啋閱掓秷鎭彁閱掗啋娑堟伅鎻愰啋閱�");
+            bean.setMarks(sponsorInfo.getAd().getDesc());
         }
 
         return bean;
@@ -117,7 +123,7 @@
         }
         conditions.add(String.format("鍙備笌鑰呭埌杈�%s浜鸿嚜鍔ㄥ紑濂�", openInfo.getMinPersonCount()));
         bean.setConditions(conditions);
-        bean.setMarks("娉細绯荤粺灏嗕細鐢盶"鏀粯瀹濋椤�-鏈嶅姟鎻愰啋\"缁欑敤鎴蜂笅鍙戞槸鍚︿腑濂栨彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掓秷鎭彁閱掗啋娑堟伅鎻愰啋閱�...\n");
+        bean.setMarks(openInfo.getRemarks());
         return bean;
     }
 

--
Gitblit v1.8.0