fix(mall): 修复会员提现状态更新逻辑

KKSU

2024-12-20 19c3da86d8c6adcb91baccac6981c63307e3dba1

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

@@ -2,8 +2,7 @@

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.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.MallUtils;
@@ -81,20 +80,6 @@
    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()){
//                Long salesmansId = mallMemberTeam.getSalesmansId();
//                MallSalesman mallSalesman = mallSalesmanMapper.selectById(salesmansId);
//                if(ObjectUtil.isNotEmpty(mallSalesman)){
//                    StringBuffer salesmanName = new StringBuffer();
//                    salesmanName.append(mallSalesman.getName());
//                    if(2 == mallSalesman.getState()){
//                        salesmanName.append("（禁用）");
//                    }
//                    mallMemberTeam.setSalesmansName(salesmanName.toString());
//                }
//            }
//        }
        return mallMembers;
    }

@@ -105,7 +90,7 @@
        if(ObjectUtil.isEmpty(mallMember)) {
            return new FebsResponse().fail().message("会员信息不存在");
        }
        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
        mallMember.setAccountStatus(YesOrNoEnum.NO.getValue());
        mallMemberMapper.updateById(mallMember);
        return new FebsResponse().success();
    }
@@ -117,7 +102,7 @@
        if(ObjectUtil.isEmpty(mallMember)) {
            return new FebsResponse().fail().message("会员信息不存在");
        }
        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
        mallMember.setAccountStatus(YesOrNoEnum.YES.getValue());
        mallMemberMapper.updateById(mallMember);
        return new FebsResponse().success();
    }
@@ -516,27 +501,46 @@
        }

        Integer type = mallSystemPayDto.getType();
        Integer flowType = 0;
        Integer moneyType = 0;
        String moneyTypeDec = "";
        String filedType = "";
        if (type == 1) {
            filedType = "balance";
            flowType = FlowTypeEnum.BALANCE.getValue();
            moneyType = RunVipMoneyFlowTypeEnum.SYS_BALANCE.getValue();
            moneyTypeDec = RunVipMoneyFlowTypeEnum.SYS_BALANCE.getDescription();
        } else if (type == 2) {
            filedType = "score";
            flowType = FlowTypeEnum.SCORE.getValue();
            moneyType = RunVipMoneyFlowTypeEnum.SYS_SCORE.getValue();
            moneyTypeDec = RunVipMoneyFlowTypeEnum.SYS_SCORE.getDescription();
        } else if (type == 3) {
            filedType = "prizeScore";
        } else {
            throw new FebsException("参数错误");
            throw new FebsException("操作失败");
        }

        if (isReduce) {
            int i = iApiMallMemberWalletService.reduce(mallSystemPayDto.getAddBalance().negate(), mallSystemPayDto.getId(), filedType);

            if (i == 2) {
                throw new FebsException("剩余数量不足");
                throw new FebsException("操作失败");
            }
        } else {
            iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
        }
        mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), MallUtils.getOrderNum(), type, null,2);
        String orderNo = MallUtils.getOrderNum("SYS");
        mallMoneyFlowService.runVipMoneyFlowAdd(
                mallMember.getId(),
                mallMember.getId(),
                orderNo,
                flowType,
                moneyType,
                bigDecimal,
                StrUtil.format(moneyTypeDec,bigDecimal),
                YesOrNoEnum.YES.getValue()
        );
        return new FebsResponse().success();
    }

@@ -586,7 +590,7 @@

            // 重置交易密码
            if (type == 1) {
                String payPwd = SecureUtil.md5("654321");
                String payPwd = SecureUtil.md5("123456");
                member.setTradePassword(payPwd);
                // 重置登录密码
            } else {