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/service/impl/ActivityServiceImpl.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/ActivityServiceImpl.java b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/ActivityServiceImpl.java
index 9ebb148..55ef141 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/ActivityServiceImpl.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/ActivityServiceImpl.java
@@ -2,7 +2,7 @@
import com.ks.daylucky.pojo.DO.ActivityTag;
import com.ks.daylucky.pojo.DO.UserInfo;
-import com.ks.daylucky.pojo.VO.ActivityDetailInfoVO;
+import com.ks.daylucky.pojo.DTO.ActivityDetailInfoDTO;
import com.ks.daylucky.pojo.VO.SimpleUser;
import com.ks.daylucky.service.ActivityService;
import com.ks.daylucky.service.ActivityTagService;
@@ -27,26 +27,25 @@
@Service
public class ActivityServiceImpl implements ActivityService {
- @Reference
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityService luckyActivityService;
- @Reference
- private ActivityTagService activityTagService;
- @Reference
+
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityJoinService luckyActivityJoinService;
-
- @Reference
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityAwardResultService luckyActivityAwardResultService;
-
-
- @Reference
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityAwardService luckyActivityAwardService;
@Resource
private UserInfoService userInfoService;
+ @Resource
+ private ActivityTagService activityTagService;
+
@Override
- public List<ActivityDetailInfoVO> getActivityDetail(List<Long> activityIds, Long appId, Long uid, Boolean needAwardResult) {
- List<ActivityDetailInfoVO> voList = new ArrayList<>();
+ public List<ActivityDetailInfoDTO> getActivityDetail(List<Long> activityIds, Long appId, Long uid, Boolean needAwardResult) {
+ List<ActivityDetailInfoDTO> voList = new ArrayList<>();
if (activityIds != null) {
for (Long activityId : activityIds) {
voList.add(getActivityDetail(activityId, appId, uid, false, 3, needAwardResult));
@@ -56,8 +55,8 @@
}
@Override
- public ActivityDetailInfoVO getActivityDetail(Long activityId, Long appId, Long uid, Boolean needTag, Integer maxJoinerCount, Boolean needAwardResult) {
- ActivityDetailInfoVO vo = new ActivityDetailInfoVO();
+ public ActivityDetailInfoDTO getActivityDetail(Long activityId, Long appId, Long uid, Boolean needTag, Integer maxJoinerCount, Boolean needAwardResult) {
+ ActivityDetailInfoDTO vo = new ActivityDetailInfoDTO();
LuckyActivity activity = luckyActivityService.getActivityDetail(activityId);
if (needTag) {
@@ -68,11 +67,11 @@
if (maxJoinerCount != null) {
//鑾峰彇鏈�杩戠殑鍙備笌鑰呭垪琛�
List<SimpleUser> userList = new ArrayList<>();
- List<ActivitySimpleUser> list = luckyActivityJoinService.getJoinerList(activityId, 1, Constant.PAGE_SIZE);
+ List<ActivitySimpleUser> list = luckyActivityJoinService.getRecentJoinerList(activityId, maxJoinerCount);
if (list != null && list.size() > 0) {
Map<Long, UserInfo> userInfoMap = userInfoService.listUserInfoAsMap(UserInfoUtil.getBaseUserList(list));
for (ActivitySimpleUser info : list) {
- UserInfo user = userInfoMap.get(info.getUid());
+ UserInfo user = userInfoMap.get(Long.parseLong(info.getUid()));
if (user != null) {
userList.add(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()));
}
@@ -94,13 +93,13 @@
if (needAwardResult) {
LuckyActivityAwardResult result = luckyActivityAwardResultService.getResult(appId, uid + "", activityId);
if (result != null) {
- vo.setAwards(luckyActivityAwardService.getAwardDetail(result.getAwardId()));
+ result.setAward(luckyActivityAwardService.getAwardDetail(result.getAwardId()));
+ vo.setAwardResult(result);
}
}
vo.setActivity(activity);
return vo;
}
-
}
--
Gitblit v1.8.0