refactor(mall): 优化订单收货类型判断逻辑

Administrator

2025-05-27 c6ac1561db0b2f1c8e3a799d7f49808f4bae67c7

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

@@ -2,11 +2,11 @@

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.StateUpDownEnum;
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.LoginUserUtil;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
@@ -76,25 +76,16 @@
    private final SalemanCouponMapper salemanCouponMapper;
    private final MallMemberCouponMapper mallMemberCouponMapper;
    private final MallGoodsCouponMapper mallGoodsCouponMapper;
    private final HappySaleLevelMapper  happySaleLevelMapper;
    private final HappyMemberLevelMapper happyMemberLevelMapper;


    @Override
    public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
        Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize());
        LambdaQueryWrapper<MallMember> mallMemberLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if(ObjectUtil.isNotEmpty(mallMember.getName())){
            mallMemberLambdaQueryWrapper.like(MallMember::getName, mallMember.getName());
        }
        if(ObjectUtil.isNotEmpty(mallMember.getPhone())){
            mallMemberLambdaQueryWrapper.eq(MallMember::getPhone, mallMember.getPhone());
        }
        if(ObjectUtil.isNotEmpty(mallMember.getCheckOrder())){
            mallMemberLambdaQueryWrapper.eq(MallMember::getCheckOrder, mallMember.getCheckOrder());
        }
        mallMemberLambdaQueryWrapper.orderByDesc(MallMember::getId);

        Page<MallMember> mallMemberPage = this.baseMapper.selectPage(page, mallMemberLambdaQueryWrapper);
//        IPage<MallMember> mallMembers = this.baseMapper.selectMallMemberListInPage(page, mallMember);
        return mallMemberPage;
        IPage<MallMember> mallMembers = this.baseMapper.selectHappyMemberListInPage(page, mallMember);
        return mallMembers;
    }

    @Override
@@ -106,6 +97,17 @@
        }
        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
        mallMemberMapper.updateById(mallMember);

        String redisKey = AppContants.XCX_LOGIN_PREFIX + id;
        String existToken = redisUtils.getString(redisKey);
        if (StrUtil.isNotBlank(existToken)) {
            Object o = redisUtils.get(existToken);
            if (ObjectUtil.isNotEmpty(o)) {
                redisUtils.del(existToken);
            }
        }
        redisUtils.del(AppContants.XCX_LOGIN_PREFIX + id);
        redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + id);
        return new FebsResponse().success();
    }

@@ -521,12 +523,16 @@

        Integer type = mallSystemPayDto.getType();
        String filedType = "";
        Integer flowType = 0;
        if (type == 1) {
            filedType = "balance";
            flowType = FlowTypeEnum.BALANCE.getValue();
        } else if (type == 2) {
            filedType = "score";
        } else if (type == 3) {
            filedType = "prizeScore";
            flowType = FlowTypeEnum.PRIZE_SCORE.getValue();
        } else if (type == 3) {
            filedType = "commission";
            flowType = FlowTypeEnum.COMMISSION.getValue();
        } else {
            throw new FebsException("参数错误");
        }
@@ -540,7 +546,15 @@
        } else {
            iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
        }
        mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, type);
        mallMoneyFlowService.addMoneyFlow(
                memberId,
                bigDecimal,
                ScoreFlowTypeEnum.SYSTEM.getValue(),
                MallUtils.getOrderNum(),
                flowType,
                StrUtil.format(ScoreFlowTypeEnum.SYSTEM.getDesc(),bigDecimal),
                2
        );
        return new FebsResponse().success();
    }

@@ -961,8 +975,23 @@
    public FebsResponse checkOrder(Long id) {

        MallMember mallMember = this.baseMapper.selectById(id);
        mallMember.setCheckOrder(StateUpDownEnum.DOWN.getCode() == mallMember.getCheckOrder() ? StateUpDownEnum.UP.getCode() : StateUpDownEnum.DOWN.getCode());
        this.baseMapper.updateById(mallMember);

        if(ObjectUtil.isNotEmpty(mallMember)){
            mallMember.setCheckOrder(StateUpDownEnum.DOWN.getCode() == mallMember.getCheckOrder() ? StateUpDownEnum.UP.getCode() : StateUpDownEnum.DOWN.getCode());
            this.baseMapper.updateById(mallMember);
        }

        return new FebsResponse().success().message("操作成功");
    }

    @Override
    public FebsResponse checkLeader(Long id) {

        MallMember mallMember = this.baseMapper.selectById(id);
        if(ObjectUtil.isNotEmpty(mallMember)){
            mallMember.setCheckLeader(StateUpDownEnum.DOWN.getCode() == mallMember.getCheckLeader() ? StateUpDownEnum.UP.getCode() : StateUpDownEnum.DOWN.getCode());
            this.baseMapper.updateById(mallMember);
        }

        return new FebsResponse().success().message("操作成功");
    }