From 37f89b3118620daa2277e227c2abdb574496ef56 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 十二月 2020 16:16:40 +0800
Subject: [PATCH] bug修复
---
service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java
index 58e96ee..39cefd1 100644
--- a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java
+++ b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java
@@ -248,6 +248,11 @@
}
@Override
+ public LuckyActivity getActivity(Long id) {
+ return luckyActivityManager.selectByPrimaryKey(id);
+ }
+
+ @Override
public LuckyActivity getActivityDetail(Long id) {
LuckyActivity activity = luckyActivityMapper.selectByPrimaryKey(id);
if (activity == null) {
@@ -264,9 +269,19 @@
}
activity.setSponsorInfo(sponsorInfo);
+
//鍔犺浇濂栭」淇℃伅
List<LuckyActivityAwards> awardsList = luckyActivityAwardManager.getAwardList(activity.getId());
- activity.setAwardsList(awardsList);
+ List<LuckyActivityAwards> awardsDetailList = new ArrayList<>();
+ if (awardsList != null) {
+ for (LuckyActivityAwards awards : awardsList) {
+ awards = luckyActivityAwardManager.getAwardDetail(awards.getId());
+ if (awards != null) {
+ awardsDetailList.add(awards);
+ }
+ }
+ }
+ activity.setAwardsList(awardsDetailList);
return activity;
}
--
Gitblit v1.8.0