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/ActivityListItemInfoVOFactory.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityListItemInfoVOFactory.java b/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityListItemInfoVOFactory.java
index 2ae2fb8..3fb12bb 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityListItemInfoVOFactory.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityListItemInfoVOFactory.java
@@ -47,8 +47,13 @@
List<ActivityAwardVO> list = new ArrayList<>();
int p = 0;
for (LuckyActivityAwards awards : activity.getAwardsList()) {
+ //鏈�澶氭樉绀�3涓椤�
+ if (list.size() >= 3) {
+ break;
+ }
list.add(create(awards, p++));
}
+ bean.setId(activity.getId());
bean.setAwardList(list);
bean.setName(activity.getName());
bean.setPoster(activity.getMaterialPoster());
@@ -58,7 +63,7 @@
public static ActivityAwardVO create(LuckyActivityAwards awards, Integer position) {
String[] pdescs = new String[]{
- "涓�", " 浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�", "鍗�"
+ "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�", "鍗�"
};
ActivityAwardVO bean = new ActivityAwardVO();
if (awards.getMaterial() != null) {
@@ -74,10 +79,10 @@
if (awards.getMaterial().getType() == LuckyActivityAwardMaterial.ActivityAwardMaterialType.alipayRedPackage) {
switch (awards.getAwardWay()) {
case LuckyActivityAwards.AWARD_WAY_DIVIDE:
- bean.setTypeIcon("");
+ bean.setTypeIcon("https://daylucky-1255749512.cos.ap-nanjing.myqcloud.com/image/icon/icon_award_way_divide.png");
break;
case LuckyActivityAwards.AWARD_WAY_RANDOM:
- bean.setTypeIcon("");
+ bean.setTypeIcon("https://daylucky-1255749512.cos.ap-nanjing.myqcloud.com/image/icon/icon_award_way_random.png");
break;
}
} else {
@@ -119,15 +124,15 @@
bean.setTitle("寰堥仐鎲撅紝棰嗗彇澶辫触銆�");
break;
}
- bean.setSubTitle(String.format("(娲诲姩鏈熷彿 %s)", ActivityUtil.getActivityDateNumber(activity.getId())));
+ bean.setSubTitle(String.format("(娲诲姩鏈熷彿 %s)", ActivityUtil.getActivityDateNumber(activity.getId(), activity.getCreateTime())));
} else {//鏈腑濂�
bean.setTitle("鏈椿鍔紝鏈腑濂栵紒");
- bean.setSubTitle(String.format("(娲诲姩鏈熷彿 %s)", ActivityUtil.getActivityDateNumber(activity.getId())));
+ bean.setSubTitle(String.format("(娲诲姩鏈熷彿 %s)", ActivityUtil.getActivityDateNumber(activity.getId(), activity.getCreateTime())));
}
break;
default:
bean.setTitle("鏈椿鍔紝鏆傛湭寮�濂栵紒");
- bean.setSubTitle(String.format("(娲诲姩鏈熷彿 %s)", ActivityUtil.getActivityDateNumber(activity.getId())));
+ bean.setSubTitle(String.format("(娲诲姩鏈熷彿 %s)", ActivityUtil.getActivityDateNumber(activity.getId(), activity.getCreateTime())));
}
--
Gitblit v1.8.0