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 |   11 +++++++----
 1 files changed, 7 insertions(+), 4 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 f30628c..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
@@ -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;
     }
 
@@ -100,9 +100,12 @@
             }
 
             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(sponsorInfo.getAd().getDesc());

--
Gitblit v1.8.0