From 6b34c3ba5cf27dd8693e2bd23426fe96fefd9688 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 30 七月 2023 23:42:35 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 a721db9..110f774 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
@@ -448,8 +448,8 @@
break;
case 4:
// 礼物类型为4，即礼品
- appBirthdayGiftVo.setGiftName(memberGiftRecord.getCouponName());
- appBirthdayGiftVo.setGiftNumber(memberGiftRecord.getCouponNumber());
+ appBirthdayGiftVo.setGiftName(memberGiftRecord.getGiftName());
+ appBirthdayGiftVo.setGiftNumber(memberGiftRecord.getGiftNumber());
break;
default:
break;
@@ -672,7 +672,9 @@
Map<Long, MgtSimpleShopVo> shopMap = simpleShopVoList.stream()
.collect(Collectors.toMap(MgtSimpleShopVo::getShopId, Function.identity()));
for(AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList){
- appMemberPrizePageVo.setVerifyShopName(shopMap.get(appMemberPrizePageVo.getShopId()).getShopName());
+ if(appMemberPrizePageVo.getShopId()!=null){
+ appMemberPrizePageVo.setVerifyShopName(shopMap.get(appMemberPrizePageVo.getShopId()).getShopName());
+ }
}
}
return memberPrizePageVoList;
--
Gitblit v1.7.1