admin
2020-12-31 74196bcc835d9b76cdd1bc3d85b0dfbe0191fc00
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
@@ -10,6 +10,7 @@
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.DO.LuckyActivityJoinRecord;
import com.ks.lucky.pojo.DTO.*;
import com.ks.lucky.remote.service.LuckyActivityAwardResultService;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
@@ -30,10 +31,10 @@
@RequestMapping("api/client/activity/join")
public class ActivityJoinController {
    @Reference(version = "1.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityJoinService luckyActivityJoinService;
    @Reference(version = "1.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityAwardResultService luckyActivityAwardResultService;
    @Resource
@@ -60,8 +61,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 +148,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 +209,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);
@@ -222,7 +227,7 @@
        joinInfo.setAlipayUid(userInfo.getAlipayUid());
        try {
            int weight = 1;
            luckyActivityJoinService.join(activityId, acceptData.getApp().getId(), acceptData.getUid() + "", 1, joinInfo);
            luckyActivityJoinService.join(activityId, acceptData.getApp().getId(), acceptData.getUid() + "", 1, joinInfo, LuckyActivityJoinRecord.USER_TYPE_REAL);
            //TODO 抽奖活动的类型需要替换
            return JsonUtil.loadTrueResult(new JoinResultInfoVO(weight, String.format("活动期号:NO.%s\n抽奖活动", activityId)));