From 8657f3758fa1acef3445f82b82f81fdba5e0c1db Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 11:29:00 +0800
Subject: [PATCH] feat(member): 更新会员公司ID逻辑 - 从API DTO中提取公司ID - 验证并转换公司编码为内部ID - 设置会员关联的公司ID - 优化公司信息查询逻辑 - 修复公司ID更新问题 - 确保会员信息正确绑定公司关系
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 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 60447a8..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);
@@ -314,8 +315,41 @@
return new HashMap<>();
}
+ List<String> ids = new ArrayList<>();
+ benefits.forEach(item -> {
+ ids.addAll(item.getDetails().stream().filter(detail -> detail.getLinkType() == 2 || detail.getLinkType() == 3).map(MallVipBenefitsDetails::getContent).collect(Collectors.toList()));
+ });
+
+ LambdaQueryWrapper<MallVipBenefitsRecord> recordQuery = new LambdaQueryWrapper<>();
+ 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);
+
Map<String, Object> map = new HashMap<>();
- map.put("benefit", benefits.get(0));
+ if (CollUtil.isEmpty(hasRecieveList)) {
+ map.put("benefit", benefits.get(0));
+ return map;
+ }
+
+ 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 -> (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());
+
+ if (CollUtil.isEmpty(collect1)) {
+ return map;
+ }
+
+ map.put("benefit", collect1.get(0));
return map;
}
+
+ @Override
+ public IPage<MallVipBenefitsRecord> findVipBenefitsInPage(MallVipBenefitsRecord record, QueryRequest request) {
+ Page<MallVipBenefitsRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return mallVipBenefitsRecordMapper.selectMemberBenefitsRecordInPage(record, page);
+ }
}
--
Gitblit v1.9.1