活动管理界面完善

admin

2021-01-28 8c1c003c60d2f27b3c55e248451caeec7f2b5631

 service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java

@@ -1,19 +1,24 @@
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.*;
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.util.Constant;
import com.ks.daylucky.util.RSAUtil;
import com.ks.daylucky.util.UserInfoUtil;
import com.ks.daylucky.util.activity.ActivityUtil;
import com.ks.lucky.exception.LuckyActivityException;
import com.ks.lucky.exception.LuckyActivityJoinAssistException;
import com.ks.lucky.pojo.DO.ActivityJoinAssistEvent;
import com.ks.lucky.pojo.DO.LuckyActivityJoinAssist;
import com.ks.lucky.pojo.DO.LuckyActivity;
import com.ks.lucky.pojo.DO.LuckyActivityJoinRecord;
import com.ks.lucky.pojo.DTO.ActivityAssistFriend;
import com.ks.lucky.pojo.DTO.ActivityFriendAssistInfo;
import com.ks.lucky.remote.service.LuckyActivityJoinAssistService;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
import com.ks.lucky.remote.service.LuckyActivityService;
import net.sf.json.JSONObject;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
@@ -31,11 +36,14 @@
@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", check = false)
    private LuckyActivityService luckyActivityService;

    @Resource
    private UserInfoService userInfoService;
@@ -43,8 +51,14 @@

    @ResponseBody
    @RequestMapping("assist")
    public String assist(AcceptData acceptData, Long activityId, Long joinId, int page) {
        LuckyActivityJoinRecord record = luckyActivityJoinService.getJoinRecord(joinId);
    public String assist(AcceptData acceptData, Long activityId, String joinInfo) {
        AssistJoinInfoDTO dto = ActivityUtil.parseShareJoinInfo(joinInfo);
        if (dto == null) {
            return JsonUtil.loadFalseResult("参与信息解析失败");
        }


        LuckyActivityJoinRecord record = luckyActivityJoinService.getJoinInfo(activityId, acceptData.getApp().getId(), dto.getUid() + "");
        //不存在助力
        if (record == null) {
            return JsonUtil.loadFalseResult("");
@@ -86,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);
    }