From dbf7f92dc6ee35ad70083ecf588fe3340f43797e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期三, 19 十月 2022 17:39:19 +0800
Subject: [PATCH] #feat 修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActIntegralUserApi.java | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActIntegralUserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActIntegralUserApi.java
index dee69e6..4d4aa95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActIntegralUserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActIntegralUserApi.java
@@ -1,22 +1,24 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.vos.community.integral.IntegralTradeVO;
+import io.swagger.annotations.ApiImplicitParam;
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
-import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.integral.ComActIntegralCommunityRankVO;
import com.panzhihua.common.model.vos.community.integral.ComActIntegralCommunityTradeVO;
import com.panzhihua.common.model.vos.community.integral.ComActIntegralUserRuleVO;
import com.panzhihua.common.model.vos.community.integral.ComActIntegralUserVO;
-import com.panzhihua.common.model.vos.community.wallet.ComActWalletRankingVO;
import com.panzhihua.common.service.community.CommunityService;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
@Slf4j
@RestController
@@ -33,47 +35,62 @@
return communityService.getIntegralExplainApplets();
}
- @ApiOperation(value = "查询社区领取积分列表",response = ComActIntegralUserRuleVO.class)
+ @ApiOperation(value = "查询社区领取积分列表", response = ComActIntegralUserRuleVO.class)
@PostMapping("/receive")
public R getIntegralReceive() {
LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
- if(userInfoVO == null){
+ if (userInfoVO == null) {
return R.fail("请先登录");
}
- return communityService.getIntegralReceiveApplets(userInfoVO.getUserId(),userInfoVO.getCommunityId());
+ return communityService.getIntegralReceiveApplets(userInfoVO.getUserId(), userInfoVO.getCommunityId());
}
- @ApiOperation(value = "查询我的积分列表",response = ComActIntegralUserVO.class)
- @PostMapping("/user/list")
- public R getIntegralUserList() {
+ @ApiOperation(value = "积分统计", response = ComActIntegralUserVO.class)
+ @ApiImplicitParam(name = "communityId", value = "社区id")
+ @GetMapping("/user/statistics")
+ public R getIntegralUserList(@RequestParam(value = "communityId", required = false) Long communityId) {
LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
- if(userInfoVO == null){
+ if (userInfoVO == null) {
return R.fail("请先登录");
}
- return communityService.getIntegralUserListApplets(userInfoVO.getUserId(),userInfoVO.getCommunityId());
+ return communityService.getIntegralUserListApplets(userInfoVO.getUserId(), communityId);
}
- @ApiOperation(value = "查询社区积分排行榜",response = ComActIntegralCommunityRankVO.class)
+ @ApiOperation(value = "查询我的积分余额", response = ComActIntegralUserVO.class)
+ @ApiImplicitParam(name = "communityId", value = "社区id", required = true)
+ @GetMapping("/user/balance")
+ public R getUserIntegralBalance(@RequestParam("communityId") Long communityId) {
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if (userInfoVO == null) {
+ return R.fail("请先登录");
+ }
+ return communityService.getUserIntegralBalance(userInfoVO.getUserId(), communityId);
+ }
+
+ @ApiOperation(value = "获取积分详情", response = IntegralTradeVO.class)
+ @ApiImplicitParam(name = "id", value = "积分明细id", required = true)
+ @GetMapping("/user/detail")
+ public R getUserIntegralDetail(@RequestParam("id") Long id) {
+ return communityService.getUserIntegralDetail(id);
+ }
+
+ @ApiOperation(value = "查询社区积分排行榜", response = ComActIntegralCommunityRankVO.class)
@PostMapping("/community/rank")
public R getIntegralCommunityRank(@RequestBody ComActIntegralCommunityRankDTO communityRankDTO) {
LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
- if(userInfoVO == null){
+ if (userInfoVO == null) {
return R.fail("请先登录");
- }
- if(communityRankDTO.getCommunityId() == null){
- communityRankDTO.setCommunityId(userInfoVO.getCommunityId());
}
return communityService.getIntegralCommunityRankApplets(communityRankDTO);
}
- @ApiOperation(value = "查询用户积分明细",response = ComActIntegralCommunityTradeVO.class)
+ @ApiOperation(value = "查询用户积分明细", response = ComActIntegralCommunityTradeVO.class)
@PostMapping("/community/trade")
public R getIntegralCommunityTrade(@RequestBody ComActIntegralCommunityRankDTO communityTradeDTO) {
LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
- if(userInfoVO == null){
+ if (userInfoVO == null) {
return R.fail("请先登录");
}
- communityTradeDTO.setCommunityId(userInfoVO.getCommunityId());
communityTradeDTO.setUserId(userInfoVO.getUserId());
return communityService.getIntegralCommunityTradeApplets(communityTradeDTO);
}
--
Gitblit v1.7.1