From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 5afa1cb..f6951ea 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -687,6 +687,7 @@
if (ObjectUtil.isEmpty(mallMember)) {
// 新增用户
mallMember = new MallMember();
+ mallMember.setName("用户" + openId);
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
mallMember.setOpenId(openId);
@@ -807,6 +808,15 @@
}
String phone = apiXcxSaveInfoDto.getPhone();
if(StrUtil.isNotEmpty(phone)){
+
+ MallMember entity = this.baseMapper.selectOne(
+ Wrappers.lambdaQuery(MallMember.class)
+ .eq(MallMember::getPhone, phone)
+ .last("LIMIT 1")
+ );
+ if(ObjectUtil.isNotNull( entity) && !entity.getId().equals(memberId)){
+ throw new FebsException("手机号码已使用");
+ }
mallMember.setPhone(phone);
}
String avatarUrl = apiXcxSaveInfoDto.getAvatarUrl();
@@ -2000,7 +2010,7 @@
apiMemberLabelItemVo.setName(mallMember.getName());
apiMemberLabelItemVo.setAvatar(mallMember.getAvatar());
apiMemberLabelItemVo.setPhone(mallMember.getPhone());
- apiMemberLabelItemVo.setScore(prizeScoreMap.get(mallMember.getId()).setScale(0,RoundingMode.DOWN));
+ apiMemberLabelItemVo.setScore(prizeScoreMap.getOrDefault(mallMember.getId(), BigDecimal.ZERO).setScale(0,RoundingMode.DOWN));
apiMemberLabelItemVos.add(apiMemberLabelItemVo);
}
}
@@ -2058,6 +2068,13 @@
Long labelId = dto.getLabelId();
Long insureMemberId = dto.getMemberId();
+ List<HappyMemberLabelRecord> happyMemberLabelRecords1 = happyMemberLabelRecordMapper.selectList(Wrappers.lambdaQuery(HappyMemberLabelRecord.class)
+ .eq(HappyMemberLabelRecord::getMemberId, insureMemberId)
+ );
+ if(CollUtil.isNotEmpty(happyMemberLabelRecords1)){
+ throw new FebsException("该用户不能重复加入");
+ }
+
HappyMemberLabel happyMemberLabel = happyMemberLabelMapper.selectById(labelId);
if(ObjectUtil.isEmpty(happyMemberLabel)){
throw new FebsException("会员标签不存在");
--
Gitblit v1.9.1