From 25680e135b5bdc15658622cbfde74bab73cfee77 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 25 十二月 2020 18:54:40 +0800
Subject: [PATCH] 功能完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
index a47e647..473af75 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
@@ -30,10 +30,10 @@
@RequestMapping("api/client/activity/join")
public class ActivityJoinController {
- @Reference(version = "1.0")
+ @Reference(version = "1.0.0")
private LuckyActivityJoinService luckyActivityJoinService;
- @Reference(version = "1.0")
+ @Reference(version = "1.0.0")
private LuckyActivityAwardResultService luckyActivityAwardResultService;
@Resource
@@ -60,8 +60,12 @@
if (list != null && list.size() > 0) {
Map<Long, UserInfo> userInfoMap = userInfoService.listUserInfoAsMap(UserInfoUtil.getBaseUserList(list));
for (ActivityJoinerRankInfo info : list) {
- UserInfo user = userInfoMap.get(info.getUid());
+ UserInfo user = userInfoMap.get(Long.parseLong(info.getUid()));
+
if (user != null) {
+ if (user.getId().longValue() == acceptData.getUid()) {
+ continue;
+ }
voList.add(new ActivityJoinerRankInfoVO(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()), info.getRank(), info.getWeight()));
}
}
@@ -143,11 +147,11 @@
public String getJoinerList(AcceptData acceptData, Long activityId, int page) {
List<SimpleUser> voList = new ArrayList<>();
- List<ActivitySimpleUser> list = luckyActivityJoinService.getJoinerList(activityId, page, Constant.PAGE_SIZE);
+ List<ActivitySimpleUser> list = luckyActivityJoinService.getJoinerList(activityId,null, page, Constant.PAGE_SIZE);
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) {
voList.add(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()));
}
@@ -204,7 +208,7 @@
List<ActivityDetailInfoDTO> voList = activityService.getActivityDetail(activityIdList, appId, uid, type == 2 ? true : false);
JSONObject data = new JSONObject();
- data.put("data", ActivityListItemInfoVOFactory.create(voList));
+ data.put("data", JsonUtil.getSimpleGson().toJson(ActivityListItemInfoVOFactory.create(voList)));
data.put("count", count);
return JsonUtil.loadTrueResult(data);
--
Gitblit v1.8.0