resource修改

admin

2020-12-17 d8d576c5220e9d24251b51a59a58271c6e0cb4a4

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

@@ -1,17 +1,20 @@
package com.ks.daylucky.controller.api.client;

import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.pojo.DTO.ActivityDetailInfoDTO;
import com.ks.daylucky.pojo.VO.*;
import com.ks.daylucky.service.ActivityService;
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.util.Constant;
import com.ks.daylucky.util.UserInfoUtil;
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.DTO.*;
import com.ks.lucky.remote.service.LuckyActivityAwardResultService;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
import net.sf.json.JSONObject;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -27,10 +30,10 @@
@RequestMapping("api/client/activity/join")
public class ActivityJoinController {

    @Resource
    @Reference(version = "1.0")
    private LuckyActivityJoinService luckyActivityJoinService;

    @Resource
    @Reference(version = "1.0")
    private LuckyActivityAwardResultService luckyActivityAwardResultService;

    @Resource
@@ -198,10 +201,10 @@
                break;
        }

        List<ActivityDetailInfoVO> voList = activityService.getActivityDetail(activityIdList, appId, uid, type == 2 ? true : false);
        List<ActivityDetailInfoDTO> voList = activityService.getActivityDetail(activityIdList, appId, uid, type == 2 ? true : false);

        JSONObject data = new JSONObject();
        data.put("data", JsonUtil.getApiCommonGson().toJson(voList));
        data.put("data", ActivityListItemInfoVOFactory.create(voList));
        data.put("count", count);

        return JsonUtil.loadTrueResult(data);