KKSU
2023-12-01 30f1895da68636011dd5ebf242616351e0e99175
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -61,6 +61,9 @@
    private final MallRegisterAppealMapper mallRegisterAppealMapper;
    private final MallMemberBankMapper mallMemberBankMapper;
    private final IMallMoneyFlowService mallMoneyFlowService;
    private final MallProductBuyRecordMapper mallProductBuyRecordMapper;
    private final MallProductBuyMapper mallProductBuyMapper;
    private final MallMemberSpeakMapper mallMemberSpeakMapper;
    @Value("${spring.profiles.active}")
@@ -105,6 +108,7 @@
        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
        mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
        mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
        mallMember.setIsFrozen(ProductEnum.MEMBER_FROZEN.getValue());
//        mallMember.setSex("男");
//        mallMember.setBindPhone(registerDto.getAccount());
@@ -147,7 +151,15 @@
        MallMemberAmount mallMemberAmount = new MallMemberAmount();
        mallMemberAmount.setMemberId(mallMember.getId());
        mallMemberAmountMapper.insert(mallMemberAmount);
        return new FebsResponse().success().message("注册成功");
        MallMemberPayment mallMemberPayment = new MallMemberPayment();
        mallMemberPayment.setMemberId(mallMember.getId());
        mallMemberPaymentMapper.insert(mallMemberPayment);
        ApiRegisterVo apiRegisterVo = new ApiRegisterVo();
        apiRegisterVo.setAccount(mallMember.getAccountLogin());
        apiRegisterVo.setUserKey(mallMember.getUserKey());
        return new FebsResponse().success().data(apiRegisterVo);
    }
    @Override
@@ -239,6 +251,20 @@
                DataDictionaryEnum.OUT_FCM_FEE.getType(),
                DataDictionaryEnum.OUT_FCM_FEE.getCode());
        mallMemberVo.setOutFcmFee(ObjectUtil.isEmpty(outFcmFeeDic) ? new BigDecimal(20) : new BigDecimal(outFcmFeeDic.getValue()));
        DataDictionaryCustom nftFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.NFT_FEE.getType(),
                DataDictionaryEnum.NFT_FEE.getCode());
        BigDecimal nftFeePercent = ObjectUtil.isEmpty(nftFeeDic) ? new BigDecimal(20) : new BigDecimal(nftFeeDic.getValue());
        mallMemberVo.setNftFee(nftFeePercent);
        DataDictionaryCustom memberFrozenFcmCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getType(),
                DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode()
        );
        BigDecimal memberFrozenFcmCnt = ObjectUtil.isEmpty(memberFrozenFcmCntDic) ? new BigDecimal(100) : new BigDecimal(memberFrozenFcmCntDic.getValue());
        mallMemberVo.setUnfrozenCnt(memberFrozenFcmCnt);
        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
        if (dic != null) {
            mallMemberVo.setLevelName(dic.getDescription());
@@ -255,14 +281,15 @@
                DataDictionaryEnum.YU_YUE_START_TIME.getType(),
                DataDictionaryEnum.YU_YUE_START_TIME.getCode()
        );
        DateTime startTime = cn.hutool.core.date.DateUtil.parseTime(startTimeDic.getValue());
        mallMemberVo.setStartTime(startTime);
        mallMemberVo.setStartTime(startTimeDic.getValue());
        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_END_TIME.getType(),
                DataDictionaryEnum.YU_YUE_END_TIME.getCode()
        );
        DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
        mallMemberVo.setEndTime(endTime);
        mallMemberVo.setEndTime(endTimeDic.getValue());
        Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id,ProductEnum.PRODUCT_BUY_SUCCESS.getValue());
        mallMemberVo.setPickCount(pickCount);
        return new FebsResponse().success().data(mallMemberVo);
    }
@@ -347,7 +374,8 @@
        IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
        Long id = LoginUserUtil.getLoginUser().getId();
        moneyFlowDto.setMemberId(id);
        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
//        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInPage(page, moneyFlowDto);
        return new FebsResponse().success().data(pages);
    }
@@ -374,7 +402,7 @@
        BigDecimal amount = transferDto.getAmount();
        int type = transferDto.getType();
        if(1 != type || 2 != type){
        if(1 != type && 2 != type){
            throw new FebsException("请选择互转类型");
        }
        Integer insideWith = loginMember.getInsideWith() == null ? 2 :loginMember.getInsideWith();
@@ -810,6 +838,18 @@
        return new FebsResponse().success().message("操作成功");
    }
    @Override
    public FebsResponse memberSpeak(ApiMemberSpeakDto memberSpeakDto) {
        MallMemberSpeak mallMemberSpeak = new MallMemberSpeak();
        if(ObjectUtil.isNotEmpty(memberSpeakDto.getMemberId())){
            mallMemberSpeak.setMemberId(memberSpeakDto.getMemberId());
        }
        mallMemberSpeak.setState(ProductEnum.SPEAK_NO_DEAL.getValue());
        mallMemberSpeak.setDescription(memberSpeakDto.getDescription());
        mallMemberSpeakMapper.insert(mallMemberSpeak);
        return new FebsResponse().success().message("操作成功");
    }
    public static void main(String[] args) {
        Set<String> objectsAccount = new HashSet<>();
        Set<String> objects = new HashSet<>();