From b646898adf3f2ad119dd9fd1c7c01d7f0742bf97 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 31 七月 2025 11:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java | 53 ++++++++++++--------------
ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml | 1
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 1
ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml | 1
ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml | 1
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java | 28 ++++++++-----
ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml | 1
7 files changed, 41 insertions(+), 45 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
index a4cb5c4..284d34d 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
@@ -63,12 +63,12 @@
@ResponseBody
- @PostMapping("/getLotteryEvent/{id}")
+ @PostMapping("/getLotteryEvent/{id}/{orderId}")
@ApiOperation(value = "获取抽奖页详情【2.0】", tags = "抽奖活动")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "抽奖活动id", required = true, dataType = "String", paramType = "path")
})
- public R<LotteryEventVo> getLotteryEvent(@PathVariable("id") String id) {
+ public R<LotteryEventVo> getLotteryEvent(@PathVariable("id") String id, @PathVariable("orderId") String orderId) {
LotteryEventVo lotteryEvent = lotteryEventService.getLotteryEvent(id);
TLotteryEvent event = lotteryEventService.getById(id);
if (LocalDateTime.now().isBefore(event.getStartTime())) {
@@ -85,12 +85,12 @@
@ResponseBody
- @PostMapping("/lotteryDraw/{id}")
+ @PostMapping("/lotteryDraw/{id}/{orderId}")
@ApiOperation(value = "抽奖操作【2.0】", tags = "抽奖活动", notes = "返回奖品ID")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "抽奖活动id", required = true, dataType = "String", paramType = "path")
})
- public R<TLotteryEventPrize> lotteryDraw(@PathVariable("id") String id) {
+ public R<TLotteryEventPrize> lotteryDraw(@PathVariable("id") String id, @PathVariable("orderId") String orderId) {
return lotteryEventService.lotteryDraw(id);
}
@@ -122,12 +122,12 @@
@ResponseBody
- @PostMapping("/getLotteryEventInfo/{id}")
+ @PostMapping("/getLotteryEventInfo/{id}/{orderId}")
@ApiOperation(value = "获取抽奖活动详情【2.0】", tags = "抽奖活动")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "抽奖活动id", required = true, dataType = "String", paramType = "path")
})
- public R<LotteryEventInfoVo> getLotteryEventInfo(@PathVariable("id") String id){
+ public R<LotteryEventInfoVo> getLotteryEventInfo(@PathVariable("id") String id, @PathVariable("orderId") String orderId){
Long userId = SecurityUtils.getUserId();
TLotteryEvent lotteryEvent = lotteryEventService.getById(id);
LotteryEventInfoVo vo = new LotteryEventInfoVo();
@@ -209,12 +209,18 @@
map.put("name", item.getAnswers());
return map;
}).collect(Collectors.toList());
- if (-1 == dto.getStepOrDown() || current == list.size() - 1) {
- TUserLotteryEventQuestionsAnswers one = userLotteryEventQuestionsAnswersService.getOne(new QueryWrapper<TUserLotteryEventQuestionsAnswers>().eq("lottery_event_question_id", lotteryEventQuestions.getId()).eq("user_id", userId).orderByDesc("create_time").last(" limit 0, 1"));
- if (null != one) {
- vo.setAnswer(lotteryEventQuestionsAnswersService.getById(one.getLotteryEventQuestionsAnswersId()).getAnswers());
- }
+
+ TUserLotteryEventQuestionsAnswers one = userLotteryEventQuestionsAnswersService.getOne(new QueryWrapper<TUserLotteryEventQuestionsAnswers>().eq("lottery_event_question_id", lotteryEventQuestions.getId()).eq("user_id", userId).orderByDesc("create_time").last(" limit 0, 1"));
+ if (null != one) {
+ vo.setAnswer(lotteryEventQuestionsAnswersService.getById(one.getLotteryEventQuestionsAnswersId()).getAnswers());
}
+
+// if (-1 == dto.getStepOrDown() || current == list.size() - 1) {
+// TUserLotteryEventQuestionsAnswers one = userLotteryEventQuestionsAnswersService.getOne(new QueryWrapper<TUserLotteryEventQuestionsAnswers>().eq("lottery_event_question_id", lotteryEventQuestions.getId()).eq("user_id", userId).orderByDesc("create_time").last(" limit 0, 1"));
+// if (null != one) {
+// vo.setAnswer(lotteryEventQuestionsAnswersService.getById(one.getLotteryEventQuestionsAnswersId()).getAnswers());
+// }
+// }
vo.setOptions(options);
}
return R.ok(vo);
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
index 11d9c43..95b7aa7 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
@@ -87,36 +87,31 @@
vo.setId(lotteryEvent.getId());
vo.setName(lotteryEvent.getName());
vo.setActivityProfile(lotteryEvent.getActivityProfile());
- //订单抽奖，每次进去都是新的抽奖机会
- if(2 == lotteryEvent.getActivityType()){
- vo.setLaveTimes(lotteryEvent.getTimes());
- }else{
- List<TUserLotteryEvent> userLotteryEvents = userLotteryEventService.list(new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id).eq("user_id", userId));
- vo.setLaveTimes(lotteryEvent.getTimes() - userLotteryEvents.size());
+ List<TUserLotteryEvent> userLotteryEvents = userLotteryEventService.list(new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id).eq("user_id", userId));
+ vo.setLaveTimes(lotteryEvent.getTimes() - userLotteryEvents.size());
- //构建我的奖品明细
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
- List<UserLotteryEventVo> collect = userLotteryEvents.stream().map(s -> {
- UserLotteryEventVo userLotteryEventVo = new UserLotteryEventVo();
- userLotteryEventVo.setName(s.getObjectName());
- userLotteryEventVo.setPrizeType(s.getPrizeType());
- userLotteryEventVo.setNumber(s.getNumber());
- if (Arrays.asList(2, 3).contains(s.getPrizeType())) {
- MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrizeByGiftId(s.getId()).getData();
- userLotteryEventVo.setVerifyCode("3-" + memberGiftRecord.getPrizeId());
- userLotteryEventVo.setIsVerify(1 == memberGiftRecord.getVerifyStatus() ? 0 : 1);
- userLotteryEventVo.setVerifyTime(null == memberGiftRecord.getVerifyTime() ? "" : sdf.format(memberGiftRecord.getVerifyTime()));
- }
- Member member = remoteMemberService.getMember(userId).getData();
- userLotteryEventVo.setVerifyShop("全部门店");
- if (null != member && null != member.getRelationShopId()) {
- Shop shop = remoteShopService.getShop(member.getRelationShopId()).getData();
- userLotteryEventVo.setVerifyShop(shop.getShopName());
- }
- return userLotteryEventVo;
- }).collect(Collectors.toList());
- vo.setYourPrizeList(collect);
- }
+ //构建我的奖品明细
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
+ List<UserLotteryEventVo> collect = userLotteryEvents.stream().map(s -> {
+ UserLotteryEventVo userLotteryEventVo = new UserLotteryEventVo();
+ userLotteryEventVo.setName(s.getObjectName());
+ userLotteryEventVo.setPrizeType(s.getPrizeType());
+ userLotteryEventVo.setNumber(s.getNumber());
+ if (Arrays.asList(2, 3).contains(s.getPrizeType())) {
+ MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrizeByGiftId(s.getId()).getData();
+ userLotteryEventVo.setVerifyCode("3-" + memberGiftRecord.getPrizeId());
+ userLotteryEventVo.setIsVerify(1 == memberGiftRecord.getVerifyStatus() ? 0 : 1);
+ userLotteryEventVo.setVerifyTime(null == memberGiftRecord.getVerifyTime() ? "" : sdf.format(memberGiftRecord.getVerifyTime()));
+ }
+ Member member = remoteMemberService.getMember(userId).getData();
+ userLotteryEventVo.setVerifyShop("全部门店");
+ if (null != member && null != member.getRelationShopId()) {
+ Shop shop = remoteShopService.getShop(member.getRelationShopId()).getData();
+ userLotteryEventVo.setVerifyShop(shop.getShopName());
+ }
+ return userLotteryEventVo;
+ }).collect(Collectors.toList());
+ vo.setYourPrizeList(collect);
//查询抽奖活动奖品
List<TLotteryEventPrize> lotteryEventPrizeList = lotteryEventPrizeService.list(new QueryWrapper<TLotteryEventPrize>().eq("lottery_event_id", id));
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
index 19ec320..75d9cea 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
@@ -16,7 +16,6 @@
# 服务注册地址
# server-addr: 47.109.78.184:5000
server-addr: 192.168.110.80:8848
- ip: 192.168.110.21
#pro
# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
index 0a117ad..6625bd9 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
@@ -16,7 +16,6 @@
# 服务注册地址
# server-addr: 47.109.78.184:5000
server-addr: 192.168.110.80:8848
- ip: 192.168.110.21
#pro
# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
# test
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
index e3cdd85..5654d3e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
@@ -17,7 +17,6 @@
# server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
server-addr: 192.168.110.80:8848
- ip: 192.168.110.21
#pro
# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
index 8d7f697..d0c83a2 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
@@ -15,7 +15,6 @@
discovery:
# 服务注册地址
server-addr: 192.168.110.80:8848
- ip: 192.168.110.21
# server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
# pro
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index a6bbb52..aaca3a5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -21,7 +21,6 @@
# server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
server-addr: 192.168.110.80:8848
- ip: 192.168.110.21
#pro
# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
--
Gitblit v1.7.1