|
@@ -2,13 +2,9 @@ package com.ylx.web.controller.point;
|
|
|
|
|
|
|
|
import com.ylx.common.core.controller.BaseController;
|
|
import com.ylx.common.core.controller.BaseController;
|
|
|
import com.ylx.common.core.domain.R;
|
|
import com.ylx.common.core.domain.R;
|
|
|
-import com.ylx.common.core.domain.model.WxLoginUser;
|
|
|
|
|
import com.ylx.common.core.page.TableDataInfo;
|
|
import com.ylx.common.core.page.TableDataInfo;
|
|
|
-import com.ylx.massage.domain.TWxUser;
|
|
|
|
|
-import com.ylx.massage.service.TWxUserService;
|
|
|
|
|
import com.ylx.point.domain.dto.UserPointActivityPageDTO;
|
|
import com.ylx.point.domain.dto.UserPointActivityPageDTO;
|
|
|
import com.ylx.point.domain.dto.UserPointPageDTO;
|
|
import com.ylx.point.domain.dto.UserPointPageDTO;
|
|
|
-import com.ylx.point.domain.vo.PointActivityPageVo;
|
|
|
|
|
import com.ylx.point.domain.vo.UserPointActivityVo;
|
|
import com.ylx.point.domain.vo.UserPointActivityVo;
|
|
|
import com.ylx.point.domain.vo.UserPointInfoVO;
|
|
import com.ylx.point.domain.vo.UserPointInfoVO;
|
|
|
import com.ylx.point.domain.vo.UserPointLogVO;
|
|
import com.ylx.point.domain.vo.UserPointLogVO;
|
|
@@ -16,13 +12,10 @@ import com.ylx.point.service.IPointActivityService;
|
|
|
import com.ylx.point.service.IPointUserLogService;
|
|
import com.ylx.point.service.IPointUserLogService;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-import io.swagger.annotations.ApiParam;
|
|
|
|
|
-import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
@RestController
|
|
@RestController
|
|
@@ -34,29 +27,14 @@ public class UserPointController extends BaseController {
|
|
|
private IPointUserLogService pointUserLogService;
|
|
private IPointUserLogService pointUserLogService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private IPointActivityService pointActivityService;
|
|
private IPointActivityService pointActivityService;
|
|
|
- @Resource
|
|
|
|
|
- private TWxUserService wxUserService;
|
|
|
|
|
|
|
|
|
|
- @PreAuthorize("@ss.hasPermi('user:point:query')")
|
|
|
|
|
@ApiOperation("获取当前用户的积分信息")
|
|
@ApiOperation("获取当前用户的积分信息")
|
|
|
@GetMapping
|
|
@GetMapping
|
|
|
public R<UserPointInfoVO> getUserPointInfo() {
|
|
public R<UserPointInfoVO> getUserPointInfo() {
|
|
|
- WxLoginUser wxLoginUser = getWxLoginUser();
|
|
|
|
|
-
|
|
|
|
|
- TWxUser user = wxUserService.getByOpenId(wxLoginUser.getCOpenid());
|
|
|
|
|
- if (user == null) {
|
|
|
|
|
- throw new RuntimeException("用户不存在");
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- String userId = user.getId();
|
|
|
|
|
-
|
|
|
|
|
-// UserPointInfoVO vo = this.pointUserLogService.getUserPointInfo();
|
|
|
|
|
-
|
|
|
|
|
- UserPointInfoVO vo = new UserPointInfoVO();
|
|
|
|
|
|
|
+ UserPointInfoVO vo = this.pointUserLogService.getUserPointInfo();
|
|
|
return R.ok(vo);
|
|
return R.ok(vo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @PreAuthorize("@ss.hasPermi('user:point:query')")
|
|
|
|
|
@ApiOperation("获取当前用户的积分信息分页数据")
|
|
@ApiOperation("获取当前用户的积分信息分页数据")
|
|
|
@PostMapping("/page")
|
|
@PostMapping("/page")
|
|
|
public TableDataInfo page(@Validated @RequestBody UserPointPageDTO dto) {
|
|
public TableDataInfo page(@Validated @RequestBody UserPointPageDTO dto) {
|
|
@@ -65,7 +43,6 @@ public class UserPointController extends BaseController {
|
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @PreAuthorize("@ss.hasPermi('user:point:query')")
|
|
|
|
|
@ApiOperation("获取当前用户活动任务分页数据")
|
|
@ApiOperation("获取当前用户活动任务分页数据")
|
|
|
@PostMapping("/activity/page")
|
|
@PostMapping("/activity/page")
|
|
|
public TableDataInfo activityPage(@Validated @RequestBody UserPointActivityPageDTO dto) {
|
|
public TableDataInfo activityPage(@Validated @RequestBody UserPointActivityPageDTO dto) {
|
|
@@ -74,7 +51,6 @@ public class UserPointController extends BaseController {
|
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @PreAuthorize("@ss.hasPermi('user:point:query')")
|
|
|
|
|
@ApiOperation("获取当前用户做任务赚积分集合")
|
|
@ApiOperation("获取当前用户做任务赚积分集合")
|
|
|
@GetMapping("/activity/list")
|
|
@GetMapping("/activity/list")
|
|
|
public R<List<UserPointActivityVo>> activityList() {
|
|
public R<List<UserPointActivityVo>> activityList() {
|