From 3dddd301e97c263dda6326c89fa11176d5960b04 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 12:11:36 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
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());
}
--
Gitblit v1.7.1