后台

KKSU

2024-07-30 c1af5cf94920702b6aa962881365116542e88ab0

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -236,7 +236,8 @@
        MallMember mallMember = this.baseMapper.selectById(id);

        MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
        if(ObjectUtil.isNotEmpty(mallMember.getReferrerId())){
//        if(ObjectUtil.isNotEmpty(mallMember.getReferrerId())){
        if(StrUtil.isNotBlank(mallMember.getReferrerId())){
            MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
            if (referMember != null) {
                mallMemberVo.setReferrerName(referMember.getName());
@@ -253,17 +254,19 @@
        }
        mallMemberVo.setLevelName(MemberLevelEnum.NORMAL.getLevelDescription(mallMember.getLevel()));
        mallMemberVo.setPartner(mallMember.getPartner());
        mallMemberVo.setDirector(mallMember.getDirector());
        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
        mallMemberVo.setBalance(wallet.getBalance());
        mallMemberVo.setScore(wallet.getScore());
        mallMemberVo.setPrizeScore(wallet.getPrizeScore());
        mallMemberVo.setEquityLimit(wallet.getEquityLimit());
        mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));

        DataDictionaryCustom poolScorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                PerkEnum.POOL_SCORE_PRICE.getType(),
                PerkEnum.POOL_SCORE_PRICE.getCode()
        );
        BigDecimal poolScorePrice = new BigDecimal(poolScorePriceDic.getValue()).setScale(6, BigDecimal.ROUND_DOWN);
        BigDecimal poolScorePrice = new BigDecimal(poolScorePriceDic.getValue()).setScale(8, BigDecimal.ROUND_DOWN);
        mallMemberVo.setPoolScorePrice(poolScorePrice);
        return new FebsResponse().success().data(mallMemberVo);
    }
@@ -399,8 +402,23 @@
        if (!loginMember.getTradePassword().equals(SecureUtil.md5(transferDto.getTradePwd()))) {
            throw new FebsException("支付密码错误");
        }
        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
        if(wallet.getBalance().compareTo(BigDecimal.ZERO) <= 0){
            throw new FebsException("金额不足");
        }
        if(wallet.getEquityLimit().compareTo(BigDecimal.ZERO) <= 0){
            throw new FebsException("权益积分不足");
        }
        if(transferDto.getAmount().compareTo(wallet.getBalance()) > 0) {
            throw new FebsException("金额不足");
        }

        if(transferDto.getAmount().compareTo(wallet.getEquityLimit()) > 0) {
            throw new FebsException("权益积分不足");
        }
        if(1 == transferDto.getType()){
            walletService.reduceBalance(transferDto.getAmount(), memberId);
            walletService.reduce(transferDto.getAmount(), memberId, "equityLimit");//减少权益积分
            String orderNo = MallUtils.getOrderNum("T");
            this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue());

@@ -408,12 +426,13 @@
            this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue());
        }
        if(2 == transferDto.getType()){
            walletService.reduce(transferDto.getAmount(), memberId, "score");
            String orderNo = MallUtils.getOrderNum("T");
            this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.SCORE.getValue());

            walletService.add(transferDto.getAmount(), mallMember.getId(), "score");
            this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.SCORE.getValue());
            throw new FebsException("暂未开通");
//            walletService.reduce(transferDto.getAmount(), memberId, "score");
//            String orderNo = MallUtils.getOrderNum("T");
//            this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.SCORE.getValue());
//
//            walletService.add(transferDto.getAmount(), mallMember.getId(), "score");
//            this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.SCORE.getValue());
        }


@@ -617,6 +636,8 @@
        mallMemberBank.setIdCardNum(updateMemberBankDto.getIdCardNum());
        mallMemberBank.setBankNo(updateMemberBankDto.getBankNo());
        mallMemberBank.setPhone(updateMemberBankDto.getPhone());
        mallMemberBank.setBankName(updateMemberBankDto.getBankName());
        mallMemberBank.setBankNameS(updateMemberBankDto.getBankNameS());
        mallMemberBankMapper.updateById(mallMemberBank);
        return new FebsResponse().success();
    }