From c7ac989e5a693bf29efb4fbaee16770442ea41a0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 七月 2025 16:15:14 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 0fe3f3e..3077c9c 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,7 +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.domain.GetLotteryEventList;
+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;
@@ -21,7 +22,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
@@ -81,7 +84,7 @@
@RequestMapping(value = "/signShare", method = RequestMethod.POST)
@ApiOperation(value = "今日分享【2.0】")
- public R<Boolean> signShare() {
+ public R<Map<String, Object>> signShare() {
Long userId = SecurityUtils.getUserId();
IntegralChangeDto integralChangeDto = new IntegralChangeDto();
integralChangeDto.setIntegralType(1);
@@ -91,7 +94,17 @@
throw new ServiceException(AppErrorConstant.DOUBLE_INTEGRAL_TASK);
}
//判断是否可以抽奖
- List<LotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData();
- return R.ok(data.size() > 0);
+ GetLotteryEventList getLotteryEventList = new GetLotteryEventList();
+ getLotteryEventList.setActivityType(3);
+ getLotteryEventList.setUserId(SecurityUtils.getUserId());
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).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(map);
}
}
--
Gitblit v1.7.1