From 916ff14278f99378758272784a00abee12a4f126 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 16:48:42 +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 | 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