修改bug

puzhibing

1 天以前 d2a65425646e33c26b8a98c394c7990a6bfb6b03

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java

@@ -3,8 +3,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.api.domain.LotteryEvent;
import com.ruoyi.goods.api.domain.GetLotteryEventList;
import com.ruoyi.goods.api.domain.TLotteryEvent;
import com.ruoyi.goods.api.domain.TLotteryEventUser;
import com.ruoyi.goods.api.service.LotteryEventClient;
import com.ruoyi.member.domain.vo.AppIntegralRecordPageVo;
import com.ruoyi.member.domain.vo.AppIntegralTaskListVo;
@@ -21,7 +25,9 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @ClassName AppIntegralController
@@ -81,7 +87,7 @@
    
    @RequestMapping(value = "/signShare", method = RequestMethod.POST)
    @ApiOperation(value = "今日分享【2.0】")
    public R<Boolean> signShare() {
    public R<Map<String, Object>> signShare() {
        Long userId = SecurityUtils.getUserId();
        IntegralChangeDto integralChangeDto = new IntegralChangeDto();
        integralChangeDto.setIntegralType(1);
@@ -91,7 +97,23 @@
            throw new ServiceException(AppErrorConstant.DOUBLE_INTEGRAL_TASK);
        }
        //判断是否可以抽奖
        List<LotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData();
        return R.ok(data.size() > 0);
        GetLotteryEventList getLotteryEventList = new GetLotteryEventList();
        getLotteryEventList.setActivityType(3);
        getLotteryEventList.setUserId(SecurityUtils.getUserId());
        List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData();
        Map<String, Object> map = new HashMap<>();
        if(data.size() > 0){
            TLotteryEvent tLotteryEvent = data.get(0);
            map.put("lotteryEventId", tLotteryEvent.getId());
            map.put("name", tLotteryEvent.getActivityProfile());
            map.put("image", tLotteryEvent.getCoverImage());
            //将数据添加到普通抽奖列表中
            TLotteryEventUser lotteryEventUser = new TLotteryEventUser();
            lotteryEventUser.setId(IdUtils.simpleUUID());
            lotteryEventUser.setLotteryEventId(tLotteryEvent.getId());
            lotteryEventUser.setUser_id(SecurityUtils.getUserId());
            lotteryEventClient.addLotteryEventUser(lotteryEventUser);
        }
        return R.ok(map);
    }
}