From 478e6722fd36bf9b5d8608c8cca2000190da5496 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十二月 2020 19:16:15 +0800
Subject: [PATCH] 功能完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 6c9ad96..eee2ce6 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
@@ -7,12 +7,14 @@
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.util.Constant;
import com.ks.daylucky.util.UserInfoUtil;
+import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
import com.ks.lucky.exception.LuckyActivityException;
import com.ks.lucky.exception.LuckyActivityJoinException;
import com.ks.lucky.pojo.DTO.*;
import com.ks.lucky.remote.service.LuckyActivityAwardResultService;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
import net.sf.json.JSONObject;
+import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -28,10 +30,10 @@
@RequestMapping("api/client/activity/join")
public class ActivityJoinController {
- @Resource
+ @Reference(version = "1.0.0")
private LuckyActivityJoinService luckyActivityJoinService;
- @Resource
+ @Reference(version = "1.0.0")
private LuckyActivityAwardResultService luckyActivityAwardResultService;
@Resource
@@ -58,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()));
}
}
@@ -145,7 +151,7 @@
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()));
}
@@ -202,7 +208,7 @@
List<ActivityDetailInfoDTO> voList = activityService.getActivityDetail(activityIdList, appId, uid, type == 2 ? true : false);
JSONObject data = new JSONObject();
- data.put("data", JsonUtil.getApiCommonGson().toJson(voList));
+ data.put("data", JsonUtil.getSimpleGson().toJson(ActivityListItemInfoVOFactory.create(voList)));
data.put("count", count);
return JsonUtil.loadTrueResult(data);
--
Gitblit v1.8.0