From 90c31b4e2be82bd9a47115e939a9ad103271fbfa Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 26 Jan 2024 22:12:40 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java
index dde27c1..2603b67 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java
@@ -13,9 +13,11 @@
import cc.mrbird.febs.vip.entity.MallVipBenefits;
import cc.mrbird.febs.vip.entity.MallVipBenefitsDetails;
import cc.mrbird.febs.vip.entity.MallVipBenefitsRecord;
+import cc.mrbird.febs.vip.entity.MallVipConfig;
import cc.mrbird.febs.vip.mapper.MallVipBenefitsDetailsMapper;
import cc.mrbird.febs.vip.mapper.MallVipBenefitsMapper;
import cc.mrbird.febs.vip.mapper.MallVipBenefitsRecordMapper;
+import cc.mrbird.febs.vip.mapper.MallVipConfigMapper;
import cc.mrbird.febs.vip.service.IMallVipBenefitsDetailsService;
import cc.mrbird.febs.vip.service.IMallVipBenefitsService;
import cn.hutool.core.collection.CollUtil;
@@ -37,6 +39,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Slf4j
@Service
@@ -52,6 +55,8 @@
private final MallOrderItemMapper mallOrderItemMapper;
private final MallVipBenefitsRecordMapper mallVipBenefitsRecordMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final MallMemberMapper mallMemberMapper;
+ private final MallVipConfigMapper mallVipConfigMapper;
@Override
public IPage<MallVipBenefits> vipBenefitsListInPage(QueryRequest request) {
@@ -116,7 +121,8 @@
@Override
public void getBenefits(Long id) {
- MallMember member = LoginUserUtil.getLoginUser();
+ MallMember loginUser = LoginUserUtil.getLoginUser();
+ MallMember member = mallMemberMapper.selectById(loginUser.getId());
MallVipBenefitsDetails benefits = mallVipBenefitsDetailsService.getById(id);
if (benefits == null) {
@@ -128,6 +134,14 @@
throw new FebsException("权益不存在");
}
+
+ MallVipConfig config = mallVipConfigMapper.selectVipConfigByCode(member.getLevel());
+ boolean b = config.getBenefits().stream().anyMatch(item -> {
+ return Objects.equals(item.getId(), benefits.getBenefitsId());
+ });
+ if (!b) {
+ throw new FebsException("未达到等级不能领取该权益");
+ }
Integer linkType = benefits.getLinkType();
@@ -165,6 +179,8 @@
record.setReceiveTime(new Date());
record.setReceiveType(linkType);
record.setReceiveId(Long.parseLong(benefits.getContent()));
+ record.setMemberId(member.getId());
+ record.setReceiveCnt(1);
// 商品
if (linkType == 2) {
@@ -191,6 +207,7 @@
orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
orderInfo.setOrderType(goods.getGoodsType());
orderInfo.setDeliveryType(2);
+ orderInfo.setIsFree(1);
orderInfo.setCarriage(BigDecimal.ZERO);
orderInfo.setAmount(BigDecimal.ZERO);
orderInfo.setAddressId(address.getId());
--
Gitblit v1.9.1