From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +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 | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 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 03f6300..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
@@ -424,14 +424,14 @@
birthdayCard.setCreateTime(new Date());
birthdayCard.setCreateUserId(merBirthdayEditDto.getUserId());
}
- birthdayCard.setCardStatus(merBirthdayEditDto.getCardStatus());
- this.saveOrUpdate(birthdayCard);
List<BirthdayGift> birthdayGiftList = birthdayGiftService.listByCardId(birthdayCard.getCardId());
if(merBirthdayEditDto.getCardStatus()==1){
if(birthdayGiftList==null||birthdayGiftList.isEmpty()){
throw new ServiceException(AppErrorConstant.BIRTHDAYCARD_NO_GIFT);
}
}
+ birthdayCard.setCardStatus(merBirthdayEditDto.getCardStatus());
+ this.saveOrUpdate(birthdayCard);
}
/**
@@ -543,6 +543,7 @@
memberGiftRecord.setDelFlag(0);
memberGiftRecord.setVerifyStatus(1);
memberGiftRecord.setGiftFrom(1);
+ memberGiftRecord.setPrizeFrom(1);
memberGiftRecord.setGiftYear(currentYear);
memberGiftRecord.setCreateTime(new Date());
memberGiftRecord.setUserId(userId);
@@ -622,6 +623,7 @@
memberGiftRecord.setDelFlag(0);
memberGiftRecord.setVerifyStatus(1);
memberGiftRecord.setGiftFrom(2);
+ memberGiftRecord.setPrizeFrom(1);
memberGiftRecord.setShopId(shopId);
memberGiftRecord.setGiftYear(currentYear);
memberGiftRecord.setCreateTime(new Date());
@@ -682,23 +684,27 @@
appBirthdayCardVo.setBirthdayGiftVoList(birthdayGiftVoList);
return appBirthdayCardVo;
}
-
+
/**
- * @description
- * @author jqs
- * @date 2023/7/11 18:02
* @param page
* @param userId
- * @return List<AppMemberPrizePageVo>
+ * @return List<AppMemberPrizePageVo>
+ * @description
+ * @author jqs
+ * @date 2023/7/11 18:02
*/
@Override
- public List<AppMemberPrizePageVo> pageAppMemberPrize(Page page, Long userId){
+ public List<AppMemberPrizePageVo> pageAppMemberPrize(Page page, Long userId) {
List<AppMemberPrizePageVo> memberPrizePageVoList = birthdayCardMapper.pageAppMemberPrize(page, userId);
- if(memberPrizePageVoList!=null&&!memberPrizePageVoList.isEmpty()){
+ if (memberPrizePageVoList != null && !memberPrizePageVoList.isEmpty()) {
HashSet<Long> shopIdSet = new HashSet<>();
- for(AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList){
- appMemberPrizePageVo.setVerifyCode("3-"+appMemberPrizePageVo.getPrizeId());
- if(appMemberPrizePageVo.getShopId()!=null){
+ for (AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList) {
+ Integer giftType = appMemberPrizePageVo.getGiftType();
+ String prizeFrom = appMemberPrizePageVo.getPrizeFrom();
+ if ("抽奖".equals(prizeFrom) && (null != giftType && (giftType == 2 || giftType == 4))) {
+ appMemberPrizePageVo.setVerifyCode("3-" + appMemberPrizePageVo.getPrizeId());
+ }
+ if (appMemberPrizePageVo.getShopId() != null) {
shopIdSet.add(appMemberPrizePageVo.getShopId());
}
}
@@ -708,8 +714,8 @@
List<MgtSimpleShopVo> simpleShopVoList = remoteShopService.listShopSimpleVoByIds(mgtBaseBathDto).getData();
Map<Long, MgtSimpleShopVo> shopMap = simpleShopVoList.stream()
.collect(Collectors.toMap(MgtSimpleShopVo::getShopId, Function.identity()));
- for(AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList){
- if(appMemberPrizePageVo.getShopId()!=null){
+ for (AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList) {
+ if (appMemberPrizePageVo.getShopId() != null) {
appMemberPrizePageVo.setVerifyShopName(shopMap.get(appMemberPrizePageVo.getShopId()).getShopName());
}
}
--
Gitblit v1.7.1