admin
2021-01-15 5405154d6979f1b50ce2d881bb164b1acca80b6d
service-daylucky/src/main/java/com/ks/daylucky/service/impl/ActivityServiceImpl.java
@@ -27,14 +27,14 @@
@Service
public class ActivityServiceImpl implements ActivityService {
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0", check = false)
    private LuckyActivityService luckyActivityService;
    @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 LuckyActivityAwardResultService luckyActivityAwardResultService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0", check = false)
    private LuckyActivityAwardService luckyActivityAwardService;
    @Resource
@@ -67,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()));
                    }
@@ -93,7 +93,8 @@
        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);