KKSU
2024-08-29 b6be66a34281cc6a72d544a92244bcc876a2c773
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -277,7 +277,7 @@
        DataDictionaryCustom fcmPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.FCM_PRICE.getType(),
                DataDictionaryEnum.FCM_PRICE.getCode());
        mallMemberVo.setFcmPrice(ObjectUtil.isEmpty(fcmPriceDic) ? new BigDecimal(2) : new BigDecimal(fcmPriceDic.getValue()));
        mallMemberVo.setFcmPrice(ObjectUtil.isEmpty(fcmPriceDic) ? new BigDecimal(8) : new BigDecimal(fcmPriceDic.getValue()));
        DataDictionaryCustom outFcmFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.OUT_FCM_FEE.getType(),
@@ -355,6 +355,31 @@
        );
        BigDecimal withdrawAmount = new BigDecimal(withdrawAmountDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
        mallMemberVo.setWithdrawAmount(withdrawAmount);
        DataDictionaryCustom usdtPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.USDT_PRICE.getType(),
                DataDictionaryEnum.USDT_PRICE.getCode()
        );
        BigDecimal usdtPrice = new BigDecimal(usdtPriceDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
        mallMemberVo.setUsdtPrice(usdtPrice);
        DataDictionaryCustom cardChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.CARD_CHANGE.getType(),
                DataDictionaryEnum.CARD_CHANGE.getCode()
        );
        mallMemberVo.setAroundType(Integer.parseInt(StrUtil.isEmpty(cardChangeDic.getValue()) ? "1" : cardChangeDic.getValue()));
        DataDictionaryCustom coinChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.COIN_CHANGE.getType(),
                DataDictionaryEnum.COIN_CHANGE.getCode()
        );
        mallMemberVo.setChangeType(Integer.parseInt(StrUtil.isEmpty(coinChangeDic.getValue()) ? "1" : coinChangeDic.getValue()));
        DataDictionaryCustom coinInsideChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.COIN_INSIDE_CHANGE.getType(),
                DataDictionaryEnum.COIN_INSIDE_CHANGE.getCode()
        );
        mallMemberVo.setAroundCoinType(Integer.parseInt(StrUtil.isEmpty(coinInsideChangeDic.getValue()) ? "1" : coinInsideChangeDic.getValue()));
        return new FebsResponse().success().data(mallMemberVo);
    }
@@ -535,6 +560,22 @@
        if(1 != type && 2 != type && 3 != type){
            throw new FebsException("请选择互转类型");
        }
        if(1 == type){
            DataDictionaryCustom coinChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                    DataDictionaryEnum.COIN_INSIDE_CHANGE.getType(),
                    DataDictionaryEnum.COIN_INSIDE_CHANGE.getCode());
            if(!"1".equals(coinChangeDic.getValue())){
                throw new FebsException("暂未开放");
            }
        }
        if(3 == type){
            DataDictionaryCustom coinChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                    DataDictionaryEnum.CARD_CHANGE.getType(),
                    DataDictionaryEnum.CARD_CHANGE.getCode());
            if(!"1".equals(coinChangeDic.getValue())){
                throw new FebsException("暂未开放");
            }
        }
        Integer insideWith = loginMember.getInsideWith() == null ? 2 :loginMember.getInsideWith();
        if (1 != insideWith) {
@@ -951,7 +992,7 @@
        MallMemberPayment mallMemberPayment = mallMemberPaymentMapper.selectByMemberId(memberId);
        mallMemberPayment.setWxQrcode(updatePaymentDto.getWxQrcode());
//        mallMemberPayment.setAliQrcode(updatePaymentDto.getAliQrcode());
        mallMemberPayment.setAliQrcode(updatePaymentDto.getAliQrcode());
        mallMemberPayment.setBankName(updatePaymentDto.getBankName());
//        mallMemberPayment.setBankNo(updatePaymentDto.getBankNo());
//        mallMemberPayment.setBank(updatePaymentDto.getBank());