From de369b4b3d87a5c1e4c8848c5b0d75fbac45459f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 26 Feb 2024 10:39:43 +0800
Subject: [PATCH] Merge branch 'blnka-vip' into blnka
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java
index 35bea61..03b7aa1 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java
@@ -1,8 +1,11 @@
package cc.mrbird.febs.vip.service.impl;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.vip.entity.MallVipBenefits;
import cc.mrbird.febs.vip.entity.MallVipConfig;
@@ -25,6 +28,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -33,6 +37,7 @@
private final IMallVipConfigBenefitsService mallVipConfigBenefitsService;
private final MallMemberMapper mallMemberMapper;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
public IPage<MallVipConfig> vipConfigList(QueryRequest request) {
@@ -42,12 +47,30 @@
@Override
public List<MallVipConfig> findConfigList() {
- return this.baseMapper.selectVipConfigList();
+ List<MallVipConfig> configs = this.baseMapper.selectVipConfigList();
+ configs.forEach(item -> {
+ List<MallVipBenefits> data = item.getBenefits().stream().filter(benefit -> {
+ return benefit.getIsShow() == 1;
+ }).peek(benefits -> {
+ benefits.setIsJump(CollUtil.isEmpty(benefits.getDetails()) ? 2 : 1);
+ }).collect(Collectors.toList());
+
+ item.setBenefits(data);
+ });
+ return configs;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void addVipConfig(MallVipConfig config) {
+ List<MallVipConfig> configs = this.baseMapper.selectVipConfigList();
+ boolean b = configs.stream().anyMatch(item -> {
+ return (item.getLevel().equals(config.getLevel()) || config.getCode().equals(item.getCode()));
+ });
+
+ if (b) {
+ throw new FebsException("会员等级或编码已存在");
+ }
this.baseMapper.insert(config);
List<MallVipConfigBenefits> configBenefitsList = new ArrayList<>();
@@ -64,6 +87,27 @@
@Override
public void editVipConfig(MallVipConfig config) {
+ MallVipConfig oldConfig = this.baseMapper.selectById(config.getId());
+
+ List<MallVipConfig> configs = this.baseMapper.selectVipConfigList();
+ boolean b = configs.stream().anyMatch(item -> {
+ return !item.getId().equals(config.getId()) && (item.getLevel().equals(config.getLevel()) || config.getCode().equals(item.getCode()));
+ });
+
+ if (b) {
+ throw new FebsException("会员等级或编码已存在");
+ }
+
+ if (!config.getCode().equals(oldConfig.getCode())) {
+ LambdaQueryWrapper<MallMember> memberQuery = new LambdaQueryWrapper<>();
+ memberQuery.eq(MallMember::getLevel, oldConfig.getCode());
+ List<MallMember> mallMembers = mallMemberMapper.selectList(memberQuery);
+ if (CollUtil.isNotEmpty(mallMembers)) {
+ throw new FebsException("会员编码绑定了客户，请调整后修改");
+ }
+ }
+
+
this.baseMapper.updateById(config);
LambdaQueryWrapper<MallVipConfigBenefits> delQuery = new LambdaQueryWrapper<>();
@@ -112,15 +156,22 @@
return false;
}
+ if (item.getGainType() == 3 && item.getScoreMultiple() != null) {
+ return true;
+ }
+
// 生日权益
if (item.getGainType() == 2 && isBirthday) {
return true;
}
+ DataDictionaryCustom data = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.VIP_DATE.getType(), DataDictionaryEnum.VIP_DATE.getCode());
+
+ String todayTime = DateUtil.format(new Date(), "MM-dd");
// 会员日
- return item.getGainType() == 1;
+ return item.getGainType() == 1 && StrUtil.equals(data.getValue(), todayTime);
}).max(Comparator.comparing(MallVipBenefits::getScoreMultiple));
- return max.orElseGet(max::get);
+ return max.orElse(null);
}
}
--
Gitblit v1.9.1