From c601b7ab50fab4cf6ba9b814f20dd6e531f04e4a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 15:02:18 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 a0b97fc..d8ae1ca 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.TLotteryEvent;
+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;
@@ -19,7 +21,9 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @ClassName AppIntegralController
@@ -32,14 +36,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 +55,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));
}
@@ -65,7 +72,7 @@
public R signToday() {
Long userId = SecurityUtils.getUserId();
IntegralChangeDto integralChangeDto = new IntegralChangeDto();
- integralChangeDto.setIntegralType(5);
+ integralChangeDto.setIntegralType(4);
integralChangeDto.setUserId(userId);
Boolean complete = memberService.changeIntegral(integralChangeDto);
if(complete){
@@ -73,18 +80,27 @@
}
return R.ok();
}
-
+
@RequestMapping(value = "/signShare", method = RequestMethod.POST)
- @ApiOperation(value = "今日分享")
- public R signShare() {
+ @ApiOperation(value = "今日分享【2.0】")
+ public R<Map<String, Object>> signShare() {
Long userId = SecurityUtils.getUserId();
IntegralChangeDto integralChangeDto = new IntegralChangeDto();
integralChangeDto.setIntegralType(1);
integralChangeDto.setUserId(userId);
Boolean complete = memberService.changeIntegral(integralChangeDto);
- if(complete){
- throw new ServiceException(AppErrorConstant.DOUBLE_INTEGRAL_TASK);
+// if (complete) {
+// throw new ServiceException(AppErrorConstant.DOUBLE_INTEGRAL_TASK);
+// }
+ //判断是否可以抽奖
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData();
+ Map<String, Object> map = new HashMap<>();
+ if(data.size() > 0){
+ TLotteryEvent tLotteryEvent = data.get(0);
+ map.put("lotteryEventId", tLotteryEvent.getId());
+ map.put("name", tLotteryEvent.getActivityProfile());
+ map.put("image", tLotteryEvent.getCoverImage());
}
- return R.ok();
+ return R.ok(map);
}
}
--
Gitblit v1.7.1