From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 d4b1453..59dc779 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
@@ -8,13 +8,10 @@
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
-import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
-import cc.mrbird.febs.mall.vo.AdminMallNewsInfoVo;
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;
@@ -24,11 +21,9 @@
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
@@ -276,6 +271,7 @@
mallMemberCouponMapper.insert(memberCoupon);
record.setReceiveName(coupon.getName());
+ record.setStatus(1);
}
mallVipBenefitsRecordMapper.insert(record);
@@ -300,6 +296,9 @@
public Map<String, Object> birthdayEvent() {
MallMember loginUser = LoginUserUtil.getLoginUser();
MallMember member = this.mallMemberMapper.selectById(loginUser.getId());
+ if(null == member.getBirthday()){
+ return new HashMap<>();
+ }
String today = DateUtil.format(new Date(), DatePattern.NORM_DATE_PATTERN);
boolean isBirthday = member.getBirthday().compareTo(DateUtil.parseDate(today)) == 0;
@@ -320,7 +319,8 @@
});
LambdaQueryWrapper<MallVipBenefitsRecord> recordQuery = new LambdaQueryWrapper<>();
- recordQuery.eq(MallVipBenefitsRecord::getReceiveId, ids)
+ recordQuery.in(MallVipBenefitsRecord::getReceiveId, ids)
+ .eq(MallVipBenefitsRecord::getMemberId, member.getId())
.ge(MallVipBenefitsRecord::getReceiveTime, DateUtil.beginOfDay(new Date()))
.le(MallVipBenefitsRecord::getReceiveTime, DateUtil.endOfDay(new Date()));
List<MallVipBenefitsRecord> hasRecieveList = mallVipBenefitsRecordMapper.selectList(recordQuery);
@@ -333,7 +333,7 @@
List<Long> hasIds = hasRecieveList.stream().map(MallVipBenefitsRecord::getReceiveId).collect(Collectors.toList());
List<MallVipBenefits> collect1 = benefits.stream().peek(item -> {
- List<MallVipBenefitsDetails> collect = item.getDetails().stream().filter(detail -> hasIds.contains(Long.parseLong(detail.getContent()))).collect(Collectors.toList());
+ List<MallVipBenefitsDetails> collect = item.getDetails().stream().filter(detail -> (detail.getLinkType() == 2 || detail.getLinkType() == 3) && !hasIds.contains(Long.parseLong(detail.getContent()))).collect(Collectors.toList());
item.setDetails(collect);
}).filter(item -> CollUtil.isNotEmpty(item.getDetails())).collect(Collectors.toList());
--
Gitblit v1.9.1