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