bug修复

admin

2020-12-19 37f89b3118620daa2277e227c2abdb574496ef56

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

@@ -2,18 +2,20 @@

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.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.ActivityListItemInfoVO;
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;
import com.ks.lucky.pojo.DO.LuckyActivity;
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;
@@ -21,6 +23,7 @@
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.util.ArrayList;
@@ -30,10 +33,10 @@
@RequestMapping("api/client/activity")
public class ActivityController {

    @Reference(version = "1.0")
    @Reference(version = "1.0.0")
    private LuckyActivityService luckyActivityService;

    @Reference(version = "1.0")
    @Reference(version = "1.0.0")
    private LuckyActivityJoinAssistService luckyActivityJoinAssistService;

    @Resource
@@ -69,9 +72,30 @@
            assistCount = (int) count;
        }

        //查询赞助商已经开始的活动数量

        ActivityDetailVO vo = ActivityDetailVOFactory.create(dto, help != null ? help.getValue() : null, assistCount);
        return JsonUtil.loadTrueResult(vo);
        long count = luckyActivityService.countActivity(acceptData.getApp().getId(), dto.getActivity().getSponsorId(), ActivityUtil.getCanShowAcivityStateList(), null);

        ActivityDetailVO vo = ActivityDetailVOFactory.create(dto, help != null ? help.getValue() : null, assistCount, (int) count);

        //分享信息

        ActivityShareInfoVO shareInfoDTO = new ActivityShareInfoVO();
        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();
        vo.setShareInfo(shareInfoDTO);


        //加入浏览记录
        ActivityScanRecord record = new ActivityScanRecord();
        record.setActivityId(activityId);
        record.setUid(acceptData.getUid());
        activityScanRecordService.addRecord(record);


        return JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(vo));
    }


@@ -95,8 +119,14 @@
            }
        }
        List<ActivityDetailInfoDTO> dtoList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);

        //TODO 测试
        for (int i = 0; i < 20; i++) {
            dtoList.add(dtoList.get(0));
        }

        JSONObject data = new JSONObject();
        data.put("data", ActivityListItemInfoVOFactory.create(dtoList));
        data.put("data", JsonUtil.getSimpleGson().toJson(ActivityListItemInfoVOFactory.create(dtoList)));
        data.put("count", count);
        return JsonUtil.loadTrueResult(data);
    }
@@ -109,6 +139,7 @@
     * @param page
     * @return
     */
    @ResponseBody
    @RequestMapping("getSponsorActivity")
    public String getSponsorActivity(AcceptData acceptData, Long sponsorId, int page) {

@@ -123,7 +154,7 @@
        }
        List<ActivityDetailInfoDTO> dtoList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);
        JSONObject data = new JSONObject();
        data.put("data", ActivityListItemInfoVOFactory.create(dtoList));
        data.put("data", JsonUtil.getSimpleGson().toJson(ActivityListItemInfoVOFactory.create(dtoList)));
        data.put("count", count);
        return JsonUtil.loadTrueResult(data);
    }
@@ -135,6 +166,7 @@
     * @param page
     * @return
     */
    @ResponseBody
    @RequestMapping("getScanActivityRecord")
    public String getScanActivityRecord(AcceptData acceptData, int page) {

@@ -149,7 +181,7 @@
        }
        List<ActivityDetailInfoDTO> dtoList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);
        JSONObject data = new JSONObject();
        data.put("data", ActivityListItemInfoVOFactory.create(dtoList));
        data.put("data", JsonUtil.getSimpleGson().toJson(ActivityListItemInfoVOFactory.create(dtoList)));
        data.put("count", count);
        return JsonUtil.loadTrueResult(data);
    }