From 3b09eb084576dd6be9a7b342edf345293bcc6459 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 25 七月 2023 09:57:27 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 e0b731f..f15aace 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
@@ -92,7 +92,11 @@
// 创建新的生日卡
BirthdayCard birthdayCard = new BirthdayCard();
birthdayCard.setDelFlag(0);
- birthdayCard.setShopId(0L);
+ if(mgtBirthdayEditDto.getShopId()!=null){
+ birthdayCard.setShopId(mgtBirthdayEditDto.getShopId());
+ }else{
+ birthdayCard.setShopId(0L);
+ }
birthdayCard.setCardStatus(mgtBirthdayEditDto.getCardStatus());
// 根据卡状态设置开启或关闭时间
if(mgtBirthdayEditDto.getCardStatus()==1){
@@ -638,6 +642,12 @@
*/
@Override
public List<AppMemberPrizePageVo> pageAppMemberPrize(Page page, Long userId){
- return birthdayCardMapper.pageAppMemberPrize(page, userId);
+ List<AppMemberPrizePageVo> memberPrizePageVoList = birthdayCardMapper.pageAppMemberPrize(page, userId);
+ if(memberPrizePageVoList!=null&&!memberPrizePageVoList.isEmpty()){
+ for(AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList){
+ appMemberPrizePageVo.setVerifyCode("3-"+appMemberPrizePageVo.getPrizeId());
+ }
+ }
+ return memberPrizePageVoList;
}
}
--
Gitblit v1.7.1