From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActIntegralUserApi.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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..cb3bf55 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,22 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+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,44 +33,44 @@
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)
+ @ApiOperation(value = "查询我的积分列表", response = ComActIntegralUserVO.class)
@PostMapping("/user/list")
public R getIntegralUserList() {
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(), userInfoVO.getCommunityId());
}
- @ApiOperation(value = "查询社区积分排行榜",response = ComActIntegralCommunityRankVO.class)
+ @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){
+ 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());
--
Gitblit v1.7.1