From 5f8f293f89f7a5b4224e4cbc5d35a680085218d9 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 20 Oct 2025 11:12:33 +0800
Subject: [PATCH] feat(ai): 添加企业成员申请功能 - 创建企业成员申请实体类 AiCompanyMemberApply - 定义成员ID、企业编码、企业名称和状态字段 - 实现 MyBatis-Plus 的 BaseMapper 接口 - 配置对应的 XML 映射文件 - 提供 IService 服务接口及其实现类 - 支持企业成员绑定审核流程的状态管理
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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..e82887b 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
@@ -276,6 +276,7 @@
mallMemberCouponMapper.insert(memberCoupon);
record.setReceiveName(coupon.getName());
+ record.setStatus(1);
}
mallVipBenefitsRecordMapper.insert(record);
@@ -320,7 +321,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 +335,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