From ea1a62ba6484d6c6cb1ca67dcea938a95ba18fc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 26 五月 2025 18:26:26 +0800
Subject: [PATCH] 新增加用户端接口
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java
index 998990b..0fe3f3e 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java
@@ -4,6 +4,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.goods.api.domain.LotteryEvent;
+import com.ruoyi.goods.api.service.LotteryEventClient;
import com.ruoyi.member.domain.vo.AppIntegralRecordPageVo;
import com.ruoyi.member.domain.vo.AppIntegralTaskListVo;
import com.ruoyi.member.service.member.IntegralRecordService;
@@ -32,14 +34,17 @@
@RestController
@RequestMapping("/app/integral")
public class AppIntegralController {
-
+
@Resource
private MemberService memberService;
-
+
@Resource
private IntegralRecordService integralRecordService;
-
-
+
+ @Resource
+ private LotteryEventClient lotteryEventClient;
+
+
@RequestMapping(value = "/pageAppMemberIntegralRecord", method = RequestMethod.POST)
@ApiOperation(value = "分页获取用户积分明细列表")
public R<Page<AppIntegralRecordPageVo>> pageAppMemberIntegralRecord(@RequestBody AppPageDto appPageDto) {
@@ -48,7 +53,7 @@
Page<AppIntegralRecordPageVo> page = new Page<>();
page.setSize(appPageDto.getPageSize());
page.setCurrent(appPageDto.getPageNum());
- List<AppIntegralRecordPageVo> integralRecordPageVoList = integralRecordService.pageAppMemberIntegralRecord(page,userId);
+ List<AppIntegralRecordPageVo> integralRecordPageVoList = integralRecordService.pageAppMemberIntegralRecord(page, userId);
return R.ok(page.setRecords(integralRecordPageVoList));
}
@@ -73,18 +78,20 @@
}
return R.ok();
}
-
+
@RequestMapping(value = "/signShare", method = RequestMethod.POST)
- @ApiOperation(value = "今日分享")
- public R signShare() {
+ @ApiOperation(value = "今日分享【2.0】")
+ public R<Boolean> signShare() {
Long userId = SecurityUtils.getUserId();
IntegralChangeDto integralChangeDto = new IntegralChangeDto();
integralChangeDto.setIntegralType(1);
integralChangeDto.setUserId(userId);
Boolean complete = memberService.changeIntegral(integralChangeDto);
- if(complete){
+ if (complete) {
throw new ServiceException(AppErrorConstant.DOUBLE_INTEGRAL_TASK);
}
- return R.ok();
+ //判断是否可以抽奖
+ List<LotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData();
+ return R.ok(data.size() > 0);
}
}
--
Gitblit v1.7.1