功能完善

admin

2020-12-25 25680e135b5bdc15658622cbfde74bab73cfee77

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

@@ -2,15 +2,14 @@

import com.ks.daylucky.pojo.DO.ActivityScanRecord;
import com.ks.daylucky.pojo.DO.AppConfig;
import com.ks.daylucky.pojo.VO.ActivityShareInfoVO;
import com.ks.daylucky.pojo.DTO.AssistJoinInfoDTO;
import com.ks.daylucky.pojo.VO.AlipayXCXShareInfoVO;
import com.ks.daylucky.pojo.DTO.ConfigKeyEnum;
import com.ks.daylucky.pojo.VO.AcceptData;
import com.ks.daylucky.pojo.DTO.ActivityDetailInfoDTO;
import com.ks.daylucky.pojo.VO.ActivityDetailVO;
import com.ks.daylucky.pojo.VO.SimpleUser;
import com.ks.daylucky.service.*;
import com.ks.daylucky.util.Constant;
import com.ks.daylucky.util.RSAUtil;
import com.ks.daylucky.util.activity.ActivityUtil;
import com.ks.daylucky.util.factory.vo.ActivityDetailVOFactory;
import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
@@ -23,10 +22,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.encrypt.AESUtil;

import javax.annotation.Resource;
import java.security.AccessControlContext;
import java.util.ArrayList;
import java.util.List;

@@ -48,6 +45,15 @@

    @Resource
    private AppConfigService appConfigService;

    @Resource
    private ActivityExtraInfoService activityExtraInfoService;

    @Resource
    private UserActivityExtraInfoService userActivityExtraInfoService;

    @Resource
    private UserInfoService userInfoService;


    /**
@@ -81,13 +87,41 @@

        //分享信息

        ActivityShareInfoVO shareInfoDTO = new ActivityShareInfoVO();
        String activityShareImage = null;
        try {
            activityShareImage = activityExtraInfoService.getShareImageLink(activityId, vo.getActivity().getAwardList(), acceptData.getApp().getId());
        } catch (Exception e) {
            e.printStackTrace();
        }

        AlipayXCXShareInfoVO shareInfoDTO = new AlipayXCXShareInfoVO();
        shareInfoDTO.setPath(String.format("/pages/activity-detail/activity-detail?id=%s&joinInfo=%s", activityId, ActivityUtil.getShareJoinInfo(acceptData.getUid(), activityId)));
        shareInfoDTO.setTitle("测试标题");
        shareInfoDTO.setDesc("测试简介");
//        shareInfoDTO.setBgImgUrl();
        shareInfoDTO.setBgImgUrl(activityShareImage);
        vo.setShareInfo(shareInfoDTO);

        //已经加入活动就需要返回助力分享图
        if (vo.isJoined()) {

            SimpleUser user = userInfoService.getSimpleUser(acceptData.getUid());
            if (user != null) {
                String assistShareImage = null;
                try {
                    assistShareImage = userActivityExtraInfoService.getShareImageLink(activityId, user, acceptData.getApp().getId());
                } catch (Exception e) {
                    e.printStackTrace();
                }

                shareInfoDTO = new AlipayXCXShareInfoVO();
                shareInfoDTO.setPath(String.format("/pages/activity-detail/activity-detail?id=%s&joinInfo=%s", activityId, ActivityUtil.getShareJoinInfo(acceptData.getUid(), activityId)));
                shareInfoDTO.setTitle("测试标题");
                shareInfoDTO.setDesc("测试简介");
                shareInfoDTO.setBgImgUrl(assistShareImage);
                vo.setAssistShareInfo(shareInfoDTO);
            }
        }


        //加入浏览记录
        ActivityScanRecord record = new ActivityScanRecord();