KKSU
2024-02-23 68a3672999b666ca83dedf190849ac3c610b01e3
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,9 +283,11 @@
        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());
@@ -308,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);
    }
@@ -376,8 +382,10 @@
        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);
    }
@@ -529,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);
@@ -881,9 +889,9 @@
        );
        BigDecimal memberFrozenFcmCnt = new BigDecimal(memberFrozenFcmCntDic.getValue());
        MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
        BigDecimal fcmCntAva = mallMemberAmount.getFcmCntAva();
        BigDecimal fcmCntAva = mallMemberAmount.getTokenAva();
        if(memberFrozenFcmCnt.compareTo(fcmCntAva) > 0){
            throw new FebsException("解除冻结需要GFA的数量为:" + fcmCntAva);
            throw new FebsException("激活需要宝石的数量为:" + fcmCntAva);
        }
        if(2 == unfreezeDto.getType()){
            List<MallMember> mallMembers = this.baseMapper.selectByRefererId(loginMember.getInviteId());
@@ -893,7 +901,7 @@
            }
        }
        BigDecimal fcmCntAvaSub = fcmCntAva.subtract(memberFrozenFcmCnt);
        mallMemberAmount.setFcmCntAva(fcmCntAvaSub);
        mallMemberAmount.setTokenAva(fcmCntAvaSub);
        mallMemberAmountMapper.updateById(mallMemberAmount);
        mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
        this.baseMapper.updateById(mallMember);
@@ -904,7 +912,7 @@
                MoneyFlowTypeNewEnum.UNFREEZE_USER.getValue(),
                MallUtils.getOrderNum(),
                memberId,
                FlowTypeNewEnum.FCM_COIN.getValue(),
                FlowTypeNewEnum.TOKEN.getValue(),
                MoneyFlowTypeNewEnum.UNFREEZE_USER.getDescrition());
        return new FebsResponse().success().message("操作成功");