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/controller/api/client/ActivityAssistController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
index 48b368a..3aa6309 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
@@ -1,5 +1,6 @@
package com.ks.daylucky.controller.api.client;
+import com.google.gson.Gson;
import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.pojo.DTO.AssistJoinInfoDTO;
import com.ks.daylucky.pojo.VO.*;
@@ -35,13 +36,13 @@
@RequestMapping("api/client/activity/assist")
public class ActivityAssistController {
- @Reference(version = "1.0.0",check = false)
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
- @Reference(version = "1.0.0",check = false)
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityJoinService luckyActivityJoinService;
- @Reference(version = "1.0.0",check = false)
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityService luckyActivityService;
@Resource
@@ -99,12 +100,14 @@
if (uidList.size() > 0) {
Map<Long, UserInfo> userInfoMap = userInfoService.listUserInfoAsMap(UserInfoUtil.getBaseUserList(recordList));
for (ActivityAssistFriend assistFriend : recordList) {
- list.add(new AssistFriendVO(userInfoMap.get(Long.parseLong(assistFriend.getUid())), assistFriend.getAssistCount()));
+ UserInfo user = userInfoMap.get(Long.parseLong(assistFriend.getUid()));
+
+ list.add(new AssistFriendVO(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()), assistFriend.getAssistCount()));
}
}
}
JSONObject data = new JSONObject();
- data.put("data", JsonUtil.getApiCommonGson().toJson(list));
+ data.put("data", new Gson().toJson(list));
data.put("count", count);
return JsonUtil.loadTrueResult(data);
}
--
Gitblit v1.8.0