From 0571bf579557ec97682a8940e29ed19699f6d95e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 10:16:32 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java | 6 +++++-
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml | 2 +-
ruoyi-modules/ruoyi-member/src/main/resources/mapper/birthday/BirthdayCardMapper.xml | 3 ++-
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java | 2 +-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java | 17 ++++++++++-------
5 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java
index 68ab24a..0e3c914 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java
@@ -95,7 +95,7 @@
@ApiOperation(value = "获取门店抽奖详情【2.0】")
public R<TLotteryEvent> getShopLotteryDrawInfo(@RequestBody DelShopLotteryDrawDto dto) {
TLotteryEvent lotteryEvent = lotteryEventService.getById(dto.getId());
- if (null == lotteryEvent) {
+ if (null == lotteryEvent || 1 == lotteryEvent.getDelFlag()) {
return R.fail("抽奖活动不存在");
}
if (!lotteryEvent.getShopId().equals(dto.getShopId().intValue())) {
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 38f11cb..5c9f368 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
@@ -36,7 +36,7 @@
DATE_FORMAT(start_time, '%Y-%m-%d %H:%i') as startTime,
DATE_FORMAT(end_time, '%Y-%m-%d %H:%i') as endTime
from t_lottery_event
- where shop_id = #{shopId}
+ where del_flag == 0 and shop_id = #{shopId}
order by create_time desc
</select>
<select id="pageMgtLotteryEvent" resultType="com.ruoyi.goods.domain.vo.MgtLotteryEventPageVo">
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java
index f1fba33..19494b1 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java
@@ -15,26 +15,29 @@
*/
@Data
public class AppMemberPrizePageVo {
-
+
@ApiModelProperty(value = "奖品id")
private String prizeId;
-
+
@ApiModelProperty(value = "奖品名称")
private String prizeName;
-
+
@ApiModelProperty(value = "奖品来源")
private String prizeFrom;
-
+
+ @ApiModelProperty(value = "礼物类型1优惠券2商品3现金4实物5积分")
+ private Integer giftType;
+
@ApiModelProperty(value = "核销状态1未核销2已核销")
private Integer verifyStatus;
-
+
@ApiModelProperty(value = "获奖时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
-
+
@ApiModelProperty(value = "核销码")
private String verifyCode;
-
+
@ApiModelProperty(value = "核销时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String verifyTime;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
index 238a73e..c44f2f0 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
@@ -699,7 +699,11 @@
if (memberPrizePageVoList != null && !memberPrizePageVoList.isEmpty()) {
HashSet<Long> shopIdSet = new HashSet<>();
for (AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList) {
- appMemberPrizePageVo.setVerifyCode("3-" + appMemberPrizePageVo.getPrizeId());
+ Integer giftType = appMemberPrizePageVo.getGiftType();
+ String prizeFrom = appMemberPrizePageVo.getPrizeFrom();
+ if ("抽奖".equals(prizeFrom) && (giftType == 2 || giftType == 4)) {
+ appMemberPrizePageVo.setVerifyCode("3-" + appMemberPrizePageVo.getPrizeId());
+ }
if (appMemberPrizePageVo.getShopId() != null) {
shopIdSet.add(appMemberPrizePageVo.getShopId());
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/birthday/BirthdayCardMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/birthday/BirthdayCardMapper.xml
index 93a003c..5f11326 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/birthday/BirthdayCardMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/birthday/BirthdayCardMapper.xml
@@ -32,7 +32,8 @@
verify_status verifyStatus,
create_time createTime,
verify_time verifyTime,
- shop_id shopId
+ shop_id shopId,
+ gift_type gifttype
FROM t_member_gift_record
WHERE del_flag = 0
AND user_id = #{userId}
--
Gitblit v1.7.1