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 | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 becd20d..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,6 +47,10 @@
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());
@@ -59,7 +63,7 @@
public static ActivityAwardVO create(LuckyActivityAwards awards, Integer position) {
String[] pdescs = new String[]{
- "涓�", " 浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�", "鍗�"
+ "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�", "鍗�"
};
ActivityAwardVO bean = new ActivityAwardVO();
if (awards.getMaterial() != null) {
@@ -120,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