From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java
index 33e02ca..603d9c7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java
@@ -2,6 +2,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.integral.IntegralUserRankVO;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
@@ -57,16 +58,27 @@
}
/**
- * 小程序-查询用户积分列表
+ * 小程序-积分统计
*
* @param userId
* 用户id
* @return 用户积分列表
*/
- @PostMapping("/user/list/applets")
+ @GetMapping("/user/statistics")
public R getIntegralUserListApplets(@RequestParam("userId") Long userId,
- @RequestParam("communityId") Long communityId) {
+ @RequestParam(value = "communityId", required = false) Long communityId) {
return comActIntegralUserService.getIntegralUserListApplets(userId, communityId);
+ }
+
+ /**
+ * 查询我的积分余额
+ * @param userId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/user/balance")
+ public R getUserIntegralBalance(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
+ return comActIntegralUserService.getUserIntegralBalance(userId, communityId);
}
/**
@@ -153,4 +165,31 @@
return comActIntegralUserService.getTaskActivityPeopleList(activityId);
}
+ /**
+ * 获取积分详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/user/detail")
+ public R getUserIntegralDetail(@RequestParam("id") Long id) {
+ return comActIntegralUserService.getUserIntegralDetail(id);
+ }
+
+ /**
+ * 小程序-查询用户在当前社区积分排名
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 用户在当前社区积分排名
+ */
+ @GetMapping("/user/getIntegralUserRank")
+ public R getIntegralUserRank(@RequestParam("communityId") Long communityId,
+ @RequestParam("userId") Long userId)
+ {
+ return R.ok(comActIntegralUserService.getIntegralUserRank(communityId,userId));
+ }
+
+
}
--
Gitblit v1.7.1