From f16f74cacb9ef0ae4be89ed15353b6a449479d8c Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Wed, 28 May 2025 13:38:09 +0800 Subject: [PATCH] feat(mall): 添加轮播图背景图片功能 --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 80 ++++++++++++++++++++++++++++++---------- 1 files changed, 60 insertions(+), 20 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java index 5ad9ccb..254e019 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java @@ -2,10 +2,11 @@ import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.entity.QueryRequest; -import cc.mrbird.febs.common.enumerates.AgentLevelEnum; -import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum; +import cc.mrbird.febs.common.enumerates.*; import cc.mrbird.febs.common.exception.FebsException; import cc.mrbird.febs.common.utils.AppContants; +import cc.mrbird.febs.common.utils.LoginUserUtil; +import cc.mrbird.febs.common.utils.MallUtils; import cc.mrbird.febs.common.utils.RedisUtils; import cc.mrbird.febs.mall.dto.*; import cc.mrbird.febs.mall.entity.*; @@ -23,6 +24,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -74,25 +76,15 @@ private final SalemanCouponMapper salemanCouponMapper; private final MallMemberCouponMapper mallMemberCouponMapper; private final MallGoodsCouponMapper mallGoodsCouponMapper; + private final HappySaleLevelMapper happySaleLevelMapper; + private final HappyMemberLevelMapper happyMemberLevelMapper; + @Override public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) { Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize()); - IPage<MallMember> mallMembers = this.baseMapper.selectMallMemberListInPage(page, mallMember); -// if(CollUtil.isNotEmpty(mallMembers.getRecords())){ -// for(MallMember mallMemberTeam : mallMembers.getRecords()){ -// Long salesmansId = mallMemberTeam.getSalesmansId(); -// MallSalesman mallSalesman = mallSalesmanMapper.selectById(salesmansId); -// if(ObjectUtil.isNotEmpty(mallSalesman)){ -// StringBuffer salesmanName = new StringBuffer(); -// salesmanName.append(mallSalesman.getName()); -// if(2 == mallSalesman.getState()){ -// salesmanName.append("(禁用)"); -// } -// mallMemberTeam.setSalesmansName(salesmanName.toString()); -// } -// } -// } +// IPage<MallMember> mallMembers = this.baseMapper.selectMallMemberListInPage(page, mallMember); + IPage<MallMember> mallMembers = this.baseMapper.selectHappyMemberListInPage(page, mallMember); return mallMembers; } @@ -105,6 +97,17 @@ } mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED); mallMemberMapper.updateById(mallMember); + + String redisKey = AppContants.XCX_LOGIN_PREFIX + id; + String existToken = redisUtils.getString(redisKey); + if (StrUtil.isNotBlank(existToken)) { + Object o = redisUtils.get(existToken); + if (ObjectUtil.isNotEmpty(o)) { + redisUtils.del(existToken); + } + } + redisUtils.del(AppContants.XCX_LOGIN_PREFIX + id); + redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + id); return new FebsResponse().success(); } @@ -520,12 +523,16 @@ Integer type = mallSystemPayDto.getType(); String filedType = ""; + Integer flowType = 0; if (type == 1) { filedType = "balance"; + flowType = FlowTypeEnum.BALANCE.getValue(); } else if (type == 2) { - filedType = "score"; - } else if (type == 3) { filedType = "prizeScore"; + flowType = FlowTypeEnum.PRIZE_SCORE.getValue(); + } else if (type == 3) { + filedType = "commission"; + flowType = FlowTypeEnum.COMMISSION.getValue(); } else { throw new FebsException("参数错误"); } @@ -539,7 +546,15 @@ } else { iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType); } - mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, type); + mallMoneyFlowService.addMoneyFlow( + memberId, + bigDecimal, + ScoreFlowTypeEnum.SYSTEM.getValue(), + MallUtils.getOrderNum(), + flowType, + StrUtil.format(ScoreFlowTypeEnum.SYSTEM.getDesc(),bigDecimal), + 2 + ); return new FebsResponse().success(); } @@ -955,4 +970,29 @@ return new FebsResponse().success().message("操作成功"); } + + @Override + public FebsResponse checkOrder(Long id) { + + MallMember mallMember = this.baseMapper.selectById(id); + + if(ObjectUtil.isNotEmpty(mallMember)){ + mallMember.setCheckOrder(StateUpDownEnum.DOWN.getCode() == mallMember.getCheckOrder() ? StateUpDownEnum.UP.getCode() : StateUpDownEnum.DOWN.getCode()); + this.baseMapper.updateById(mallMember); + } + + return new FebsResponse().success().message("操作成功"); + } + + @Override + public FebsResponse checkLeader(Long id) { + + MallMember mallMember = this.baseMapper.selectById(id); + if(ObjectUtil.isNotEmpty(mallMember)){ + mallMember.setCheckLeader(StateUpDownEnum.DOWN.getCode() == mallMember.getCheckLeader() ? StateUpDownEnum.UP.getCode() : StateUpDownEnum.DOWN.getCode()); + this.baseMapper.updateById(mallMember); + } + + return new FebsResponse().success().message("操作成功"); + } } -- Gitblit v1.9.1