From 68a3672999b666ca83dedf190849ac3c610b01e3 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 23 Feb 2024 11:41:04 +0800 Subject: [PATCH] 抽奖 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 76 insertions(+), 13 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 3e63cf0..6506e51 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 @@ -105,10 +105,11 @@ } // mallMember.setName(registerDto.getName()); // mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE); - mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED); + mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE); mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL); mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode()); - mallMember.setIsFrozen(ProductEnum.MEMBER_FROZEN.getValue()); + mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue()); + mallMember.setPartner(2); // mallMember.setSex("男"); // mallMember.setBindPhone(registerDto.getAccount()); @@ -282,11 +283,14 @@ Integer insureMinute = Integer.parseInt(ObjectUtil.isEmpty(insureMinuteDic) ? "60" : insureMinuteDic.getValue()); mallMemberVo.setMinuteCnt(insureMinute); - DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel()); + DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(mallMember.getLevel(), mallMember.getLevel()); if (dic != null) { mallMemberVo.setLevelName(dic.getDescription()); + }else{ + mallMemberVo.setLevelName("非会员"); } MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(mallMember.getId()); + mallMemberVo.setGsd(mallMemberAmount.getGsd()); mallMemberVo.setStaticNft(mallMemberAmount.getStaticNft()); mallMemberVo.setTrendsNft(mallMemberAmount.getTrendsNft()); mallMemberVo.setFrozenNft(mallMemberAmount.getFrozenNft()); @@ -307,6 +311,9 @@ Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id); mallMemberVo.setPickCount(pickCount); + + BigDecimal totalPerk = mallProductBuyMapper.selectTotalPerkByMemberId(mallMember.getId()); + mallMemberVo.setTotalPerk(totalPerk); return new FebsResponse().success().data(mallMemberVo); } @@ -375,9 +382,64 @@ MyTeamVo myTeamVo = new MyTeamVo(); myTeamVo.setTeam(list); - myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1)); - myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2)); + BigDecimal myAchieve = this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1); + myTeamVo.setMyAchieve(myAchieve); + BigDecimal myTeamAchieve = this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2); + myTeamVo.setMyTeamAchieve(myTeamAchieve.add(myAchieve)); myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size()); + return new FebsResponse().success().data(myTeamVo); + } + + @Override + public FebsResponse teamFcmList(TeamListDto teamListDto) { + Long memberId = null; + if (ObjectUtil.isEmpty(teamListDto.getId())) { + memberId = LoginUserUtil.getLoginUser().getId(); + } else { + memberId = teamListDto.getId(); + } + + MallMember mallMember = this.baseMapper.selectById(memberId); + + MyFcmTeamVo myTeamVo = new MyFcmTeamVo(); + myTeamVo.setMemberId(mallMember.getId()); + myTeamVo.setAccountLogin(mallMember.getAccountLogin()); + myTeamVo.setIsFrozen(mallMember.getIsFrozen()); + myTeamVo.setLevelName(MemberLevelNewEnum.ZERO_LEVEL.getLevelName(mallMember.getLevel())); + myTeamVo.setMyAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 1)); + myTeamVo.setMyAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 1)); + myTeamVo.setMyTeamAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 2)); + myTeamVo.setMyTeamAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 2)); + myTeamVo.setMyTeamMemberCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size()); + Integer buyCnt = this.baseMapper.selectAchieveBuyOrderCntByMemberId(mallMember.getInviteId()); + Integer sellCnt = this.baseMapper.selectAchieveSellOrderCntByMemberId(mallMember.getInviteId()); + myTeamVo.setMyTeamOrderCnt(buyCnt+sellCnt); + + List<MallMember> mallMembersDirects = this.baseMapper.selectChildAgentListByInviteId(mallMember.getInviteId()); + List<MyFcmTeamVo> list = new ArrayList<>(); + if(CollUtil.isNotEmpty(mallMembersDirects)){ + for(MallMember mallMembersDirect : mallMembersDirects){ + MyFcmTeamVo myTeamDirectVo = new MyFcmTeamVo(); + myTeamDirectVo.setMemberId(mallMembersDirect.getId()); + myTeamDirectVo.setAccountLogin(mallMembersDirect.getAccountLogin()); + myTeamDirectVo.setIsFrozen(mallMembersDirect.getIsFrozen()); + myTeamDirectVo.setLevelName(MemberLevelNewEnum.ZERO_LEVEL.getLevelName(mallMembersDirect.getLevel())); + myTeamDirectVo.setMyAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 1)); + myTeamDirectVo.setMyAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 1)); + myTeamDirectVo.setMyTeamAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 2)); + myTeamDirectVo.setMyTeamAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 2)); + myTeamDirectVo.setMyTeamMemberCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMembersDirect.getInviteId()).size()); + Integer buyCntDirect = this.baseMapper.selectAchieveBuyOrderCntByMemberId(mallMembersDirect.getInviteId()); + Integer sellCntDirect = this.baseMapper.selectAchieveSellOrderCntByMemberId(mallMembersDirect.getInviteId()); + myTeamDirectVo.setMyTeamOrderCnt(buyCntDirect+sellCntDirect); + list.add(myTeamDirectVo); + } + } + + myTeamVo.setTeam(list); + + + return new FebsResponse().success().data(myTeamVo); } @@ -475,7 +537,7 @@ } if(2 == type){ if (amount.compareTo(mallMemberAmountLogin.getTokenAva()) > 0) { - throw new FebsException("门票不足"); + throw new FebsException("宝石不足"); } mallMemberAmountLogin.setTokenAva(mallMemberAmountLogin.getTokenAva().subtract(amount)); mallMemberAmountMapper.updateTokenAvaById(mallMemberAmountLogin); @@ -806,6 +868,7 @@ @Override public FebsResponse unfreeze(UnfreezeDto unfreezeDto) { Long memberId = LoginUserUtil.getLoginUser().getId(); + MallMember loginMember = this.baseMapper.selectById(memberId); /** * 判断账号是否冻结 * 判断账号FCM代币是否足够 @@ -825,31 +888,31 @@ DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode() ); BigDecimal memberFrozenFcmCnt = new BigDecimal(memberFrozenFcmCntDic.getValue()); - MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(unfreezeMemberId); - BigDecimal fcmCntAva = mallMemberAmount.getFcmCntAva(); + MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId); + BigDecimal fcmCntAva = mallMemberAmount.getTokenAva(); if(memberFrozenFcmCnt.compareTo(fcmCntAva) > 0){ - throw new FebsException("解除冻结需要FCM的数量为:" + fcmCntAva); + throw new FebsException("激活需要宝石的数量为:" + fcmCntAva); } if(2 == unfreezeDto.getType()){ - List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId()); + List<MallMember> mallMembers = this.baseMapper.selectByRefererId(loginMember.getInviteId()); List<Long> collectMemberIds = mallMembers.stream().map(MallMember::getId).collect(Collectors.toList()); if(!collectMemberIds.contains(unfreezeMemberId)){ throw new FebsException("直接推荐人才能解除账户的冻结状态"); } } BigDecimal fcmCntAvaSub = fcmCntAva.subtract(memberFrozenFcmCnt); - mallMemberAmount.setFcmCntAva(fcmCntAvaSub); + mallMemberAmount.setTokenAva(fcmCntAvaSub); mallMemberAmountMapper.updateById(mallMemberAmount); mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue()); this.baseMapper.updateById(mallMember); mallMoneyFlowService.addMoneyFlow( - mallMember.getId(), + memberId, memberFrozenFcmCnt.negate(), MoneyFlowTypeNewEnum.UNFREEZE_USER.getValue(), MallUtils.getOrderNum(), memberId, - FlowTypeNewEnum.FCM_COIN.getValue(), + FlowTypeNewEnum.TOKEN.getValue(), MoneyFlowTypeNewEnum.UNFREEZE_USER.getDescrition()); return new FebsResponse().success().message("操作成功"); -- Gitblit v1.9.1