From 2530099d143123f89ecdef3df6ef95cb6b7162e8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 七月 2025 11:38:40 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
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 d8e5498..8767ffc 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
@@ -445,8 +445,10 @@
voList.forEach(x->{
if (null == x.getShopId()){
x.setCreateObject("平台创建");
+
}else {
//线下抽奖，获取门店名称
+ x.setActivityType(6);
if(map.containsKey(Long.valueOf(x.getShopId()))){
x.setCreateObject(map.get(Long.valueOf(x.getShopId())).getShopName());
}else {
@@ -471,13 +473,7 @@
}
MgtLotteryEventDetailVO vo = new MgtLotteryEventDetailVO();
BeanUtils.copyProperties(lotteryEvent, vo);
- if (lotteryEvent.getActivityType()==6) {
- //线下抽奖 取商户名称
- Shop data = remoteShopService.getShop(Long.valueOf(lotteryEvent.getShopId())).getData();
- if (null != data) {
- vo.setShopName(data.getShopName());
- }
- }
+
if(lotteryEvent.getActivityType()==5){
//题干数据
List<TLotteryEventQuestions> questionsList = lotteryEventQuestionsService.getBaseMapper().selectList(new LambdaQueryWrapper<TLotteryEventQuestions>().eq(TLotteryEventQuestions::getLotteryEventId, lotteryEvent.getId()));
@@ -509,7 +505,14 @@
.eq(TLotteryEventPrize::getLotteryEventId, lotteryEvent.getId()));*/
List<TLotteryEventPrize> prizeList = lotteryEventPrizeService.getPrizeListByLotteryEventId(lotteryEvent.getId());
vo.setLotteryEventPrizeList(prizeList);
-
+ if(null!=lotteryEvent.getShopId()){
+ vo.setActivityType(6);
+ //线下抽奖 取商户名称
+ Shop data = remoteShopService.getShop(Long.valueOf(lotteryEvent.getShopId())).getData();
+ if (null != data) {
+ vo.setShopName(data.getShopName());
+ }
+ }
return R.ok(vo);
}
--
Gitblit v1.7.1