KKSU
2024-02-19 4aad16fd01bed0070570bc2e4bf10e812a489976
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -109,6 +109,7 @@
        mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
        mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
        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);
    }
@@ -384,7 +391,7 @@
    @Override
    public FebsResponse teamFcmList(TeamListDto teamListDto) {
        Long memberId = null;
        if (teamListDto.getId() == null) {
        if (ObjectUtil.isEmpty(teamListDto.getId())) {
            memberId = LoginUserUtil.getLoginUser().getId();
        } else {
            memberId = teamListDto.getId();
@@ -411,9 +418,9 @@
        if(CollUtil.isNotEmpty(mallMembersDirects)){
            for(MallMember mallMembersDirect : mallMembersDirects){
                MyFcmTeamVo myTeamDirectVo = new MyFcmTeamVo();
                myTeamVo.setMemberId(mallMembersDirect.getId());
                myTeamVo.setAccountLogin(mallMembersDirect.getAccountLogin());
                myTeamVo.setIsFrozen(mallMembersDirect.getIsFrozen());
                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));
@@ -528,7 +535,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);
@@ -859,6 +866,7 @@
    @Override
    public FebsResponse unfreeze(UnfreezeDto unfreezeDto) {
        Long memberId = LoginUserUtil.getLoginUser().getId();
        MallMember loginMember = this.baseMapper.selectById(memberId);
        /**
         * 判断账号是否冻结
         * 判断账号FCM代币是否足够
@@ -878,13 +886,13 @@
                DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode()
        );
        BigDecimal memberFrozenFcmCnt = new BigDecimal(memberFrozenFcmCntDic.getValue());
        MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(unfreezeMemberId);
        MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
        BigDecimal fcmCntAva = mallMemberAmount.getFcmCntAva();
        if(memberFrozenFcmCnt.compareTo(fcmCntAva) > 0){
            throw new FebsException("解除冻结需要FCM的数量为:" + fcmCntAva);
            throw new FebsException("解除冻结需要GFA的数量为:" + 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("直接推荐人才能解除账户的冻结状态");
@@ -897,7 +905,7 @@
        this.baseMapper.updateById(mallMember);
        mallMoneyFlowService.addMoneyFlow(
                mallMember.getId(),
                memberId,
                memberFrozenFcmCnt.negate(),
                MoneyFlowTypeNewEnum.UNFREEZE_USER.getValue(),
                MallUtils.getOrderNum(),