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/mapper/MallMemberMapper.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
index 00eb352..4aa7dd9 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
@@ -3,15 +3,20 @@
import cc.mrbird.febs.mall.dto.AgentDto;
import cc.mrbird.febs.mall.dto.AgentLevelDto;
import cc.mrbird.febs.mall.dto.RankAwardDto;
+import cc.mrbird.febs.mall.dto.sale.ApiSaleListInfoDto;
+import cc.mrbird.febs.mall.dto.sale.ApiTeamListInfoDto;
import cc.mrbird.febs.mall.entity.AppVersion;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.mall.vo.sale.ApiSaleListInfoVo;
+import cc.mrbird.febs.mall.vo.sale.ApiTeamListInfoVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -23,6 +28,8 @@
MallMember selectInfoByAccount(@Param("account") String account);
IPage<MallMember> selectMallMemberListInPage(Page<MallMember> page, @Param("record")MallMember mallMember);
+
+ IPage<MallMember> selectHappyMemberListInPage(Page<MallMember> page, @Param("record")MallMember mallMember);
MallMember selectInfoByInviteId(@Param("inviteId") String inviteId);
@@ -67,4 +74,32 @@
List<MallMember> selectMallMemberByInviteIdAndLevel(@Param("inviteId")String inviteId, @Param("level")String level);
AdminAgentLevelSetInfoVo getAgentLevelSetInfoByMemberId(@Param("id")long id);
+
+ IPage<MallDataVo> getMallDataListInPage(Page<MallDataVo> page, @Param("record")MallMember mallMember);
+
+ IPage<MallMember> selectRankListInPage(IPage<MallMember> page, @Param("record") MallMember mallMember);
+
+ BigDecimal selectAchieveByMemberId(@Param("inviteId") String inviteId, @Param("type") Integer type);
+
+ List<MallMember> selectMemberByName(@Param("name") String name);
+
+ // 查询有下级的用户
+ List<MallMember> selectMemberListHasChild();
+
+ List<MallMember> selectMemberDirectForHasLevel(@Param("inviteId") String inviteId);
+
+ List<MallMember> selectDirectorsOrStoreMaster(@Param("type") Integer type);
+
+ List<MallMember> selectMemberWithLevel(String level);
+
+ MallMember selectMemberByOpenId(@Param("openId")String openId);
+
+ IPage<MallMember> getsalemanRuleList(Page<MallMember> page, @Param("record")MallMember mallMember);
+
+ void updateReferrerId(@Param("id")Long id);
+ void updateLastLoginTime(@Param("id")Long id,@Param("lastLoginTime") Date lastLoginTime);
+
+ IPage<ApiTeamListInfoVo> selectTeamPage(Page<ApiTeamListInfoVo> page, @Param("record")ApiTeamListInfoDto dto);
+
+ Page<ApiSaleListInfoVo> selectSalePage(Page<ApiSaleListInfoVo> objectPage, @Param("record")ApiSaleListInfoDto dto);
}
--
Gitblit v1.9.1