From 535c81a311bcd54b7ef5aa3f02b3cddc19b854d1 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Thu, 15 May 2025 16:06:14 +0800 Subject: [PATCH] feat(mall): 新增订单项的积分金额和积分价格字段- 在 MallOrderInfoMapper.xml 中添加了 item_score_amount 和 item_score_price 字段的映射 - 在 MallOrderItem 实体类中添加了 itemScorePrice 字段 - 更新了 selectNewApiOrderListInPage 查询,加入了积分金额和积分价格的计算 --- src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 54 insertions(+), 5 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 cda8ef2..4aa7dd9 100644 --- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java +++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java @@ -2,17 +2,21 @@ 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.AdminAgentLevelVo; -import cc.mrbird.febs.mall.vo.AdminAgentVo; -import cc.mrbird.febs.mall.vo.MallMemberVo; -import cc.mrbird.febs.mall.vo.TeamListVo; +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; /** @@ -24,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); @@ -51,6 +57,49 @@ List<MallMember> selectAllChildAgentListByInviteId(@Param("inviteId")String inviteId); - List<MallMember> selectMemberParentAgentList(@Param("list") List<String> inviteIds); + List<MallMember> selectMemberParentAgentList(@Param("list") List<String> inviteIds, @Param("refererId") String refererId); + IPage<AdminAgentLevelVo> getAgentLevelListInPage(Page<AdminAgentLevelVo> page, @Param("record")AgentLevelDto agentLevelDto); + + IPage<AdminAgentMemberVo> getAgentChildInPage(Page<AdminAgentMemberVo> page, @Param("record")MallMember mallMember); + + IPage<AdminRankAwardVo> getRankAwardListInPage(Page<AdminRankAwardVo> page, RankAwardDto rankAwardDto); + + BigDecimal getAgentTeamAmountByInviteId(@Param("inviteId")String inviteId); + + IPage<AppVersion> getAppVersionListInPage(Page<AppVersion> page, AppVersion appVersion); + + List<MallMember> selectByIdAndNoLevel(@Param("refererId") String refererId, @Param("level") String level); + + 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