From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 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..b223bc4 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
@@ -381,7 +381,7 @@
birthdayGift.setGiftName(dto.getGiftName());
birthdayGift.setGiftNumber(dto.getGiftNumber());
birthdayGift.setMoney(dto.getMoney());
- birthdayGift.setWinningProbability(dto.getWinningProbability());
+ birthdayGift.setWinningProbability(new BigDecimal("100.00"));
birthdayGiftList.add(birthdayGift);
});
// 批量保存生日礼物
@@ -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;
@@ -545,8 +545,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;
@@ -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,9 +672,34 @@
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());
+ if(appMemberPrizePageVo.getShopId()!=null){
+ appMemberPrizePageVo.setVerifyShopName(shopMap.get(appMemberPrizePageVo.getShopId()).getShopName());
+ }
}
}
return memberPrizePageVoList;
}
+
+
+ /**
+ * @description 判断生日卡开启状态
+ * @author jqs
+ * @date 2023/8/1 15:43
+ * @param
+ * @return void
+ */
+ @Override
+ public Integer checkBirthdayCard(Long shopId){
+ // 获取平台生日卡信息
+ BirthdayCard plBirthdayCard = birthdayCardMapper.getPlatformBirthdayCard(shopId);
+ // 如果生日卡存在
+ if (plBirthdayCard == null || plBirthdayCard.getCardStatus()!=1) {
+ return 0;
+ }
+ Integer marketingStatus = remoteShopService.getShopMarketingStatus(shopId).getData();
+ if(marketingStatus<=1){
+ return 0;
+ }
+ return 1;
+ }
}
--
Gitblit v1.7.1