admin
2021-01-28 8c1c003c60d2f27b3c55e248451caeec7f2b5631
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")
    @Reference(version = "1.0.0", check = false)
    private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0", check = false)
    private LuckyActivityJoinService luckyActivityJoinService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0", check = false)
    private LuckyActivityService luckyActivityService;
    @Resource
@@ -57,7 +58,7 @@
        }
        LuckyActivityJoinRecord record = luckyActivityJoinService.getJoinInfo(activityId, acceptData.getApp().getId(), acceptData.getUid() + "");
        LuckyActivityJoinRecord record = luckyActivityJoinService.getJoinInfo(activityId, acceptData.getApp().getId(), dto.getUid() + "");
        //不存在助力
        if (record == null) {
            return JsonUtil.loadFalseResult("");
@@ -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);
    }