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-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java | 2 +-
1 files changed, 1 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 c44f2f0..652d5ec 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
@@ -701,7 +701,7 @@
for (AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList) {
Integer giftType = appMemberPrizePageVo.getGiftType();
String prizeFrom = appMemberPrizePageVo.getPrizeFrom();
- if ("抽奖".equals(prizeFrom) && (giftType == 2 || giftType == 4)) {
+ if ("抽奖".equals(prizeFrom) && (null != giftType && (giftType == 2 || giftType == 4))) {
appMemberPrizePageVo.setVerifyCode("3-" + appMemberPrizePageVo.getPrizeId());
}
if (appMemberPrizePageVo.getShopId() != null) {
--
Gitblit v1.7.1