admin
2020-12-26 b82493b0c083ed6bd5c0013bf21b8cb651a32eec
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
@@ -1,18 +1,23 @@
package com.ks.daylucky.controller.api.client;
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.LuckyActivityJoinAssist;
import com.ks.lucky.pojo.DO.ActivityJoinAssistEvent;
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;
@@ -30,11 +35,14 @@
@RequestMapping("api/client/activity/assist")
public class ActivityAssistController {
    @Reference
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
    @Resource
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityJoinService luckyActivityJoinService;
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityService luckyActivityService;
    @Resource
    private UserInfoService userInfoService;
@@ -42,15 +50,21 @@
    @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(), acceptData.getUid() + "");
        //不存在助力
        if (record == null) {
            return JsonUtil.loadFalseResult("");
        }
        try {
            luckyActivityJoinAssistService.assist(activityId, acceptData.getApp().getId(), acceptData.getUid() + "", record.getUid(), LuckyActivityJoinAssist.ActivityJoinAssistEvent.assist, 1);
            luckyActivityJoinAssistService.assist(activityId, acceptData.getApp().getId(), acceptData.getUid() + "", record.getUid(), ActivityJoinAssistEvent.assist, 1);
            UserInfo user = userInfoService.getUserDetail(Long.parseLong(record.getUid()));
@@ -115,7 +129,7 @@
                if (user != null) {
                    List<String> eventList = new ArrayList<>();
                    if (info.getEventList() != null) {
                        for (LuckyActivityJoinAssist.ActivityJoinAssistEvent event : info.getEventList()) {
                        for (ActivityJoinAssistEvent event : info.getEventList()) {
                            eventList.add(event.getName());
                        }
                    }