From 4ff383b3c9e251c73b3825005fbaa045403d8cc9 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 19 六月 2025 11:59:12 +0800
Subject: [PATCH] 抽奖bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtLotteryEventPageVo.java | 2 +-
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java | 6 ++++--
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml | 3 ---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventPrizeServiceImpl.java | 7 +++++++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventPrizeService.java | 2 ++
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventPrizeMapper.xml | 3 +++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/lottery/LotteryEventPrizeMapper.java | 2 ++
7 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtLotteryEventPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtLotteryEventPageVo.java
index ff73d16..59ccf09 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtLotteryEventPageVo.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtLotteryEventPageVo.java
@@ -13,7 +13,7 @@
@ApiModelProperty("活动id")
private String id;
- @ApiModelProperty(value = "门店id",hidden = true)
+ @ApiModelProperty(value = "门店id")
private Integer shopId;
@ApiModelProperty("抽奖名称")
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/lottery/LotteryEventPrizeMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/lottery/LotteryEventPrizeMapper.java
index e396b72..b8221e0 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/lottery/LotteryEventPrizeMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/lottery/LotteryEventPrizeMapper.java
@@ -14,4 +14,6 @@
void deleteByLotteryEventId(@Param("lotteryEventId") String lotteryEventId);
void savePrizeList(@Param("list") List<LotteryEventPrize> prizeList);
+
+ List<LotteryEventPrize> getPrizeListByLotteryEventId(@Param("lotteryEventId") String lotteryEventId);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventPrizeServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventPrizeServiceImpl.java
index 15e01d4..9f9f34d 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventPrizeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventPrizeServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.goods.service.lottery.ILotteryEventPrizeService;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
/**
@@ -23,4 +24,10 @@
public void savePrizeList(List<LotteryEventPrize> prizeList) {
this.baseMapper.savePrizeList(prizeList);
}
+
+ @Override
+ public List<LotteryEventPrize> getPrizeListByLotteryEventId(String lotteryEventId) {
+
+ return this.baseMapper.getPrizeListByLotteryEventId(lotteryEventId);
+ }
}
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 f7beca2..93a76cc 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
@@ -307,6 +307,7 @@
}
//新增
BeanUtils.copyProperties(dto, lotteryEvent);
+ lotteryEvent.setDelFlag(0);
if (dto.getId() == null) {
lotteryEvent.setId(IdUtils.simpleUUID());
lotteryEvent.setCreateTime(LocalDateTime.now());
@@ -438,8 +439,9 @@
vo.setMgtLotteryQuestionVOList(questionsVOList);
}
//奖项信息
- List<LotteryEventPrize> prizeList = lotteryEventPrizeService.getBaseMapper().selectList(new LambdaQueryWrapper<LotteryEventPrize>()
- .eq(LotteryEventPrize::getLotteryEventId, lotteryEvent.getId()));
+ /*List<LotteryEventPrize> prizeList = lotteryEventPrizeService.getBaseMapper().selectList(new LambdaQueryWrapper<LotteryEventPrize>()
+ .eq(LotteryEventPrize::getLotteryEventId, lotteryEvent.getId()));*/
+ List<LotteryEventPrize> prizeList = lotteryEventPrizeService.getPrizeListByLotteryEventId(lotteryEvent.getId());
vo.setLotteryEventPrizeList(prizeList);
return R.ok(vo);
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventPrizeService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventPrizeService.java
index 3f519b2..40a5506 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventPrizeService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventPrizeService.java
@@ -13,4 +13,6 @@
void deleteByLotteryEventId(String lotteryEventId);
void savePrizeList(List<LotteryEventPrize> prizeList);
+
+ List<LotteryEventPrize> getPrizeListByLotteryEventId(String lotteryEventId);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml
index fdd8183..1bf4081 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml
@@ -86,7 +86,6 @@
<when test="dto.shopIds != null and dto.shopIds.size() > 0">
<choose>
<when test="dto.flag != null and dto.flag == 1">
- -- flag=1: 需要查询shop_id为null的记录 即平台创建的
AND (shop_id IN
<foreach collection="dto.shopIds" item="shopId" open="(" separator="," close=")">
#{shopId}
@@ -94,7 +93,6 @@
OR shop_id IS NULL)
</when>
<otherwise>
- -- flag不为1: 只查询shopIds的值
AND shop_id IN
<foreach collection="dto.shopIds" item="shopId" open="(" separator="," close=")">
#{shopId}
@@ -103,7 +101,6 @@
</choose>
</when>
<when test="dto.flag != null and dto.flag == 1">
- -- shopIds为空但flag=1: 即查询平台创建，其他店铺没有类似的名称
AND shop_id IS NULL
</when>
</choose>
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventPrizeMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventPrizeMapper.xml
index 21d0091..877f7c2 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventPrizeMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventPrizeMapper.xml
@@ -28,4 +28,7 @@
DELETE FROM t_lottery_event_prize
WHERE lottery_event_id = #{lotteryEventId}
</delete>
+ <select id="getPrizeListByLotteryEventId" resultType="com.ruoyi.goods.api.domain.LotteryEventPrize">
+ select * from t_lottery_event_prize where lottery_event_id = #{lotteryEventId}
+ </select>
</mapper>
--
Gitblit v1.7.1