From 7b7209a7b9b5a991481bc933996ac67c9ca5f8b0 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Tue, 08 Jul 2025 15:01:14 +0800 Subject: [PATCH] feat(mall): 更新管理员数据信息中的总会员数和总活动会员数 --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 504 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 480 insertions(+), 24 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 7a91557..c90e08c 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,15 +2,14 @@ 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.FlowTypeEnum; -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.*; -import cc.mrbird.febs.mall.entity.MallNewsInfo; import cc.mrbird.febs.mall.mapper.*; import cc.mrbird.febs.mall.service.IAdminMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; @@ -19,21 +18,26 @@ import cc.mrbird.febs.pay.model.MemberWithdrawalDto; import cc.mrbird.febs.pay.service.IXcxPayService; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; 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.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.xmlbeans.impl.store.Query; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -46,6 +50,8 @@ @RequiredArgsConstructor @Transactional public class AdminMallMemberServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements IAdminMallMemberService { + + private final RedisUtils redisUtils; private final MallMemberMapper mallMemberMapper; @@ -68,19 +74,22 @@ private final IMallMoneyFlowService mallMoneyFlowService; private final MallTeamLeaderMapper mallTeamLeaderMapper; + private final MallAgentRecordMapper mallAgentRecordMapper; + private final MallSalesmanMapper mallSalesmanMapper; + private final SalemanCouponMapper salemanCouponMapper; + private final MallMemberCouponMapper mallMemberCouponMapper; + private final MallGoodsCouponMapper mallGoodsCouponMapper; + private final HappySaleLevelMapper happySaleLevelMapper; + private final HappyMemberLevelMapper happyMemberLevelMapper; + private final MallOrderInfoMapper mallOrderInfoMapper; + private final HappyActivityOrderMapper happyActivityOrderMapper; + + @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()){ - String inviteId = mallMemberTeam.getInviteId(); - MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCodeAndOrderBycreateTime(inviteId); - if(ObjectUtil.isNotEmpty(mallTeamLeader)){ - mallMemberTeam.setLeaderState(mallTeamLeader.getState() == null ? 0 : mallTeamLeader.getState()); - } - } - } +// IPage<MallMember> mallMembers = this.baseMapper.selectMallMemberListInPage(page, mallMember); + IPage<MallMember> mallMembers = this.baseMapper.selectHappyMemberListInPage(page, mallMember); return mallMembers; } @@ -93,6 +102,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(); } @@ -277,6 +297,126 @@ return dataDictionaryCustomMapper.getAgentLevelOption(); } + + @Override + public List<AdminAgentLevelOptionTreeVo> agentLevelOption() { + return dataDictionaryCustomMapper.agentLevelOption(); + } + + @Override + public FebsResponse agentVerifyUpdate(AdminAgentVerifyVo adminAgentVerifyVo) { + MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(adminAgentVerifyVo.getId()); + if(ObjectUtil.isEmpty(mallAgentRecord)){ + throw new FebsException("记录不存在"); + } + BigDecimal amount = adminAgentVerifyVo.getAmount(); + if(BigDecimal.ZERO.compareTo(amount) >= 0){ + throw new FebsException("请输入正确的金额"); + } +// if(StrUtil.isEmpty(adminAgentVerifyVo.getLevelCode())){ +// throw new FebsException("请选择代理级别"); +// } +// mallAgentRecord.setAgentLevel(adminAgentVerifyVo.getLevelCode()); + mallAgentRecord.setAmount(adminAgentVerifyVo.getAmount()); + mallAgentRecordMapper.updateById(mallAgentRecord); + return new FebsResponse().success().message("操作成功"); + } + + @Override + public FebsResponse doctorStateChange(Long id) { + MallMember mallMember = this.baseMapper.selectById(id); + if(ObjectUtil.isEmpty(mallMember)){ + throw new FebsException("请刷新页面"); + } + mallMember.setDoctorState(mallMember.getDoctorState() == 1 ? 0 : 1); + this.baseMapper.updateById(mallMember); + return new FebsResponse().success().message("操作成功"); + } + + @Override + public FebsResponse upCoupon(Long id) { + MallMember mallMember = this.baseMapper.selectById(id); + if(ObjectUtil.isEmpty(mallMember)){ + throw new FebsException("请刷新页面"); + } + mallMember.setIsSale(1); + this.baseMapper.updateById(mallMember); + return new FebsResponse().success().message("操作成功"); + } + + @Override + public FebsResponse downCoupon(Long id) { + MallMember mallMember = this.baseMapper.selectById(id); + if(ObjectUtil.isEmpty(mallMember)){ + throw new FebsException("请刷新页面"); + } + mallMember.setIsSale(2); + this.baseMapper.updateById(mallMember); + + QueryWrapper<SalemanCoupon> objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("member_id",mallMember.getId()); + List<SalemanCoupon> salemanCouponList = salemanCouponMapper.selectList(objectQueryWrapper); + if(CollUtil.isNotEmpty(salemanCouponList)){ + for(SalemanCoupon salemanCoupon : salemanCouponList){ + salemanCouponMapper.deleteById(salemanCoupon); + } + } + + return new FebsResponse().success().message("操作成功"); + } + + @Override + public FebsResponse memberOut(Long id) { + + MallMember mallMember = this.baseMapper.selectById(id); + if(ObjectUtil.isEmpty(mallMember)){ + throw new FebsException("请刷新页面"); + } + String redisKey = AppContants.XCX_LOGIN_PREFIX + mallMember.getId(); + 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); + this.baseMapper.deleteById(mallMember); + return new FebsResponse().success().message("操作成功"); + } + + @Override + public IPage<MallMember> getsalemanRuleList(MallMember mallMember, QueryRequest request) { + Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize()); + IPage<MallMember> mallMembers = this.baseMapper.getsalemanRuleList(page, mallMember); + return mallMembers; + } + + @Override + public FebsResponse salemanCoupon(MallMember mallmember) { + MallMember member = this.baseMapper.selectById(mallmember.getId()); + if(ObjectUtil.isEmpty(member)){ + throw new FebsException("请刷新页面"); + } + Long couponId = mallmember.getCouponId(); + + QueryWrapper<SalemanCoupon> objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("member_id",member.getId()); + List<SalemanCoupon> salemanCouponList = salemanCouponMapper.selectList(objectQueryWrapper); + if(CollUtil.isNotEmpty(salemanCouponList)){ + SalemanCoupon salemanCoupon = salemanCouponList.get(0); + salemanCoupon.setCouponId(couponId); + salemanCouponMapper.updateById(salemanCoupon); + return new FebsResponse().success().message("操作成功"); + } + SalemanCoupon salemanCoupon = new SalemanCoupon(); + salemanCoupon.setMemberId(member.getId()); + salemanCoupon.setCouponId(couponId); + salemanCouponMapper.insert(salemanCoupon); + return new FebsResponse().success().message("操作成功"); + } + @Override public IPage<AdminAgentMemberVo> agentChild(QueryRequest request, MallMember mallMember) { Long memberId = mallMember.getId(); @@ -388,12 +528,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("参数错误"); } @@ -407,7 +551,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(); } @@ -575,16 +727,29 @@ @Override @Transactional(rollbackFor = Exception.class) public void modifyReferer(MallMember member) { - MallMember referer = this.baseMapper.selectInfoByInviteId(member.getReferrerId()); + if(StrUtil.isEmpty(member.getReferrerId())){ + this.baseMapper.updateReferrerId(member.getId()); + return; + } + String referrerId = member.getReferrerId();//新的推荐人邀请码 + //获取新推荐人信息 + MallMember referer = this.baseMapper.selectInfoByInviteId(referrerId); if (referer == null) { throw new FebsException("推荐人不存在"); } - String refererId = member.getReferrerId(); + member = this.baseMapper.selectById(member.getId());//修改的用户 - member = this.baseMapper.selectById(member.getId()); - - String beforeReferer = member.getReferrerId(); - member.setReferrerId(refererId); + if(member.getInviteId().equals(referrerId)){ + throw new FebsException("自己不能推荐自己"); + } + String refererId = referer.getInviteId();//新推荐人的邀请码 + if(StrUtil.isNotEmpty(referer.getReferrerIds())){ + if (referer.getReferrerIds().contains(member.getInviteId())) { + throw new FebsException("修改的推荐关系不符合规则"); + } + } +// String beforeReferer = member.getReferrerId(); + member.setReferrerId(refererId);//更新用户的上级推荐人为新推荐人的邀请码refererId String refererIds = refererIds(refererId); member.setReferrerIds(refererIds); this.baseMapper.updateById(member); @@ -598,6 +763,171 @@ child.setReferrerIds(member.getInviteId() + "," + refererIds); this.baseMapper.updateById(child); } + } + + @Override + public IPage<MallAgentRecord> getAgentApplyList(MallAgentRecord mallAgentRecord, QueryRequest request) { + Page<MallAgentRecord> page = new Page<>(request.getPageNum(), request.getPageSize()); + IPage<MallAgentRecord> mallAgentRecords = mallAgentRecordMapper.selectMallAgentRecordListInPage(page, mallAgentRecord); + return mallAgentRecords; + } + + @Override + @Transactional + public FebsResponse agreeAgentApply(Long id) { + MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(id); + if(ObjectUtil.isEmpty(mallAgentRecord)){ + return new FebsResponse().fail().message("申请记录不存在"); + } + mallAgentRecord.setState(MallAgentRecord.APPLY_AGREE); + mallAgentRecordMapper.updateById(mallAgentRecord); + + //更新用户表中的LEVEL + MallMember mallMember = this.baseMapper.selectById(mallAgentRecord.getMemberId()); + if(ObjectUtil.isEmpty(mallMember)){ + return new FebsResponse().fail().message("用户不存在"); + } + mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name()); + this.baseMapper.updateById(mallMember); + return new FebsResponse().success(); + } + + @Override + @Transactional + public FebsResponse disagreeAgentApply(Long id) { + MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(id); + if(ObjectUtil.isEmpty(mallAgentRecord)){ + return new FebsResponse().fail().message("申请记录不存在"); + } + mallAgentRecord.setState(MallAgentRecord.APPLY_DISAGREE); + mallAgentRecordMapper.updateById(mallAgentRecord); + return new FebsResponse().success(); + } + + @Override + public IPage<MallSalesman> getMallSalesmanListInPage(MallSalesman mallSalesman, QueryRequest request) { + Page<MallSalesman> page = new Page<>(request.getPageNum(), request.getPageSize()); + return mallSalesmanMapper.selectMallSalesmanListInPage(page, mallSalesman); + } + + @Override + public FebsResponse addSalesman(MallSalesman mallSalesman) { + mallSalesmanMapper.insert(mallSalesman); + return new FebsResponse().success(); + } + + @Override + public FebsResponse salesmanDel(Long id) { + MallSalesman mallSalesman = mallSalesmanMapper.selectById(id); + if(ObjectUtil.isEmpty(mallSalesman)){ + return new FebsResponse().fail().message("推销员不存在"); + } + mallSalesman.setState(2); + mallSalesmanMapper.updateById(mallSalesman); + return new FebsResponse().success(); + } + + @Override + public FebsResponse salesmanUpdate(MallSalesman mallSalesman) { + MallSalesman mallSalesmanNow = mallSalesmanMapper.selectById(mallSalesman.getId()); + if(ObjectUtil.isEmpty(mallSalesmanNow)){ + return new FebsResponse().fail().message("推销员不存在"); + } + mallSalesmanMapper.updateById(mallSalesman); + return new FebsResponse().success(); + } + + @Override + public FebsResponse salesmanUse(Long id) { + MallSalesman mallSalesman = mallSalesmanMapper.selectById(id); + if(ObjectUtil.isEmpty(mallSalesman)){ + return new FebsResponse().fail().message("推销员不存在"); + } + mallSalesman.setState(1); + mallSalesmanMapper.updateById(mallSalesman); + return new FebsResponse().success(); + } + + @Override + public List<AdminMallSalesmansTreeVo> getSalesmansTree() { + List<AdminMallSalesmansTreeVo> adminMallSalesmansTreeVos = mallSalesmanMapper.selectTreeByState(1); + return adminMallSalesmansTreeVos; + } + + @Override + public FebsResponse memberUpdateSalesman(MallMember mallmember) { + MallMember mallMemberNow = mallMemberMapper.selectById(mallmember.getId()); + if(ObjectUtil.isEmpty(mallMemberNow)){ + return new FebsResponse().fail().message("用户不存在"); + } + mallMemberNow.setSalesmansId(mallmember.getSalesmansId()); + mallMemberMapper.updateById(mallMemberNow); + return new FebsResponse().success(); + } + + @Override + public IPage<AdminMallAddressInfoVo> getAddressAmountList(MallAddressInfo mallAddressInfo, QueryRequest request) { + + Page<AdminMallAddressInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize()); + IPage<AdminMallAddressInfoVo> adminMallAddressInfoVoIPage = mallSalesmanMapper.selectAddressAmountListInPage(page, mallAddressInfo); + List<AdminMallAddressInfoVo> records = adminMallAddressInfoVoIPage.getRecords(); + if(CollUtil.isNotEmpty(records)){ + for(AdminMallAddressInfoVo adminMallAddressInfoVo : records){ + String province = adminMallAddressInfoVo.getProvince(); + String city = adminMallAddressInfoVo.getCity(); + BigDecimal sumAmount = mallSalesmanMapper.selectSumOrderAmountByProvinceAndCity(province,city); + adminMallAddressInfoVo.setAmount(sumAmount); + Integer orderCnt = mallSalesmanMapper.selectSumOrderCntByProvinceAndCity(province,city); + adminMallAddressInfoVo.setOrderCnt(orderCnt); + } + } + return adminMallAddressInfoVoIPage; + } + + @Override + public List<AdminMallAddressInfoVo> getAddressTree() { + return mallSalesmanMapper.selectProvince(); + } + + @Override + public IPage<AdminSalesmanAchieveVo> getSalesmanAchieveList(MallSalesman mallSalesman, QueryRequest request) { + Page<AdminSalesmanAchieveVo> page = new Page<>(request.getPageNum(), request.getPageSize()); + IPage<AdminSalesmanAchieveVo> adminSalesmanAchieveVoIPage = mallSalesmanMapper.selectSalesmanAchieveListInPage(page, mallSalesman); + List<AdminSalesmanAchieveVo> records = adminSalesmanAchieveVoIPage.getRecords(); + if(CollUtil.isNotEmpty(records)){ + for(AdminSalesmanAchieveVo adminSalesmanAchieveVo : records){ + Long salesmanId = adminSalesmanAchieveVo.getSalesmanId(); + List<AdminMemberOrderVo> adminMemberOrderVos = mallSalesmanMapper.selectAdminMemberOrderVoBySalesmanId(salesmanId); + adminSalesmanAchieveVo.setOrderCnt(adminMemberOrderVos.size()); + adminSalesmanAchieveVo.setAdminMemberOrderVos(adminMemberOrderVos); + } + } + return adminSalesmanAchieveVoIPage; + } + + @Override + public List<AdminSalesmanAchieveVo> getSalesmanAchieveTree() { + return mallSalesmanMapper.selectSalesmanAchieveProvince(); + } + + @Override + public IPage<AdminMallAgentRecordVo> getAgentAchieveList(MallAgentRecord mallAgentRecord, QueryRequest request) { + Page<AdminMallAgentRecordVo> page = new Page<>(request.getPageNum(), request.getPageSize()); + IPage<AdminMallAgentRecordVo> adminMallAgentRecordVos = mallSalesmanMapper.selectAgentAchieveListInPage(page, mallAgentRecord); + return adminMallAgentRecordVos; + } + + @Override + public List<AdminMallAgentRecordVo> agentAddress() { + List<AdminMallAgentRecordVo> adminMallAgentRecordVos = mallSalesmanMapper.selectAgentAddressProvince(); + if(CollUtil.isNotEmpty(adminMallAgentRecordVos)){ + for(AdminMallAgentRecordVo adminMallAgentRecordVo : adminMallAgentRecordVos){ + String province = adminMallAgentRecordVo.getProvince(); + List<String> cityList = mallSalesmanMapper.selectAgentAddressCity(province); + adminMallAgentRecordVo.setCityList(cityList); + } + } + return adminMallAgentRecordVos; } private String refererIds(String parentId) { @@ -624,4 +954,130 @@ return ids; } + + @Override + public FebsResponse addMemberCoupon(MallMember member) { + MallGoodsCoupon existCoupon = mallGoodsCouponMapper.selectById(member.getCouponId()); + if(existCoupon == null) { + return new FebsResponse().fail().message("优惠券不存在"); + } + + MallMemberCoupon memberCoupon = new MallMemberCoupon(); + memberCoupon.setCouponId(existCoupon.getId()); + memberCoupon.setCouponName(existCoupon.getName()); + memberCoupon.setInviteId(member.getInviteId()); + memberCoupon.setCouponUuid(IdUtil.simpleUUID()); + memberCoupon.setState(1); + memberCoupon.setFromType(4); + memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), existCoupon.getExpireDay())); + memberCoupon.setMemberId(member.getId()); + mallMemberCouponMapper.insert(memberCoupon); + + 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("操作成功"); + } + + @Override + public FebsResponse dataInfo() { + AdminDataInfoVo adminDataInfoVo = new AdminDataInfoVo(); + + List<MallMember> mallMembers = this.baseMapper.selectList(null); + if(CollUtil.isNotEmpty(mallMembers)){ + adminDataInfoVo.setTotalMember(mallMembers.size() + 64997); + + adminDataInfoVo.setTotalDayMember( + Math.toIntExact(mallMembers.stream().filter(mallMember -> DateUtil.compare(mallMember.getCreatedTime(), DateUtil.beginOfDay(new Date())) >= 0).count())); + adminDataInfoVo.setTotalWeekMember( + Math.toIntExact(mallMembers.stream().filter(mallMember -> DateUtil.compare(mallMember.getCreatedTime(), DateUtil.beginOfWeek(new Date())) >= 0).count())); + adminDataInfoVo.setTotalMonthMember( + Math.toIntExact(mallMembers.stream().filter(mallMember -> DateUtil.compare(mallMember.getCreatedTime(), DateUtil.beginOfMonth(new Date())) >= 0).count())); + } + + + BigDecimal totalAmount = BigDecimal.ZERO;//总数 + BigDecimal totalDayAmount = BigDecimal.ZERO;//新增 + BigDecimal totalWeekAmount = BigDecimal.ZERO;//本周新增 + BigDecimal totalMonthAmount = BigDecimal.ZERO;//本月新增 + + List<MallOrderInfo> mallOrderInfos = mallOrderInfoMapper.selectList( + Wrappers.lambdaQuery(MallOrderInfo.class) + .eq(MallOrderInfo::getPayResult, "1") + ); + if(CollUtil.isNotEmpty(mallOrderInfos)){ + totalAmount = totalAmount.add(mallOrderInfos.stream().map(MallOrderInfo::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalDayAmount = totalDayAmount.add( + mallOrderInfos.stream().filter(entity -> DateUtil.compare(entity.getPayTime(), DateUtil.beginOfDay(new Date())) >= 0) + .map(MallOrderInfo::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalWeekAmount = totalWeekAmount.add( + mallOrderInfos.stream().filter(entity -> DateUtil.compare(entity.getPayTime(), DateUtil.beginOfWeek(new Date())) >= 0) + .map(MallOrderInfo::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalMonthAmount = totalMonthAmount.add( + mallOrderInfos.stream().filter(entity -> DateUtil.compare(entity.getPayTime(), DateUtil.beginOfMonth(new Date())) >= 0) + .map(MallOrderInfo::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); + } + + List<HappyActivityOrder> happyActivityOrders = happyActivityOrderMapper.selectList( + Wrappers.lambdaQuery(HappyActivityOrder.class) + .eq(HappyActivityOrder::getPayState, StateUpDownEnum.PAY_STATE_PAY_SUCCESS.getCode()) + ); + if(CollUtil.isNotEmpty(happyActivityOrders)){ + totalAmount = totalAmount.add(happyActivityOrders.stream().map(HappyActivityOrder::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalDayAmount = totalDayAmount.add( + happyActivityOrders.stream().filter(entity -> DateUtil.compare(entity.getPayTime(), DateUtil.beginOfDay(new Date())) >= 0) + .map(HappyActivityOrder::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalWeekAmount = totalWeekAmount.add( + happyActivityOrders.stream().filter(entity -> DateUtil.compare(entity.getPayTime(), DateUtil.beginOfWeek(new Date())) >= 0) + .map(HappyActivityOrder::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalMonthAmount = totalMonthAmount.add( + happyActivityOrders.stream().filter(entity -> DateUtil.compare(entity.getPayTime(), DateUtil.beginOfMonth(new Date())) >= 0) + .map(HappyActivityOrder::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); + } + adminDataInfoVo.setTotalAmount(totalAmount); + adminDataInfoVo.setTotalDayAmount(totalDayAmount); + adminDataInfoVo.setTotalWeekAmount(totalWeekAmount); + adminDataInfoVo.setTotalMonthAmount(totalMonthAmount); + + List<HappyActivityOrder> happyActivityDoneOrders = happyActivityOrderMapper.selectList( + Wrappers.lambdaQuery(HappyActivityOrder.class) + .eq(HappyActivityOrder::getPayState, StateUpDownEnum.PAY_STATE_PAY_SUCCESS.getCode()) + .eq(HappyActivityOrder::getState, StateUpDownEnum.ORDER_STATE_USED.getCode()) + ); + + if(CollUtil.isNotEmpty(happyActivityDoneOrders)){ + adminDataInfoVo.setTotalActivityMember(happyActivityDoneOrders.size() + 64997); + + adminDataInfoVo.setTotalActivityDayMember( + Math.toIntExact(happyActivityDoneOrders.stream().filter(entity -> DateUtil.compare(entity.getCreatedTime(), DateUtil.beginOfDay(new Date())) >= 0).count())); + adminDataInfoVo.setTotalActivityWeekMember( + Math.toIntExact(happyActivityDoneOrders.stream().filter(entity -> DateUtil.compare(entity.getCreatedTime(), DateUtil.beginOfWeek(new Date())) >= 0).count())); + adminDataInfoVo.setTotalActivityMonthMember( + Math.toIntExact(happyActivityDoneOrders.stream().filter(entity -> DateUtil.compare(entity.getCreatedTime(), DateUtil.beginOfMonth(new Date())) >= 0).count())); + } + + return new FebsResponse().success().data(adminDataInfoVo); + } } -- Gitblit v1.9.1