关闭订单确认赠送GFD

KKSU

2024-05-24 b922c159f4791e940ff4b017848e4998d3b44e1b

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

@@ -66,6 +66,7 @@
    private final MallProductBuyRecordMapper mallProductBuyRecordMapper;
    private final MallProductBuyMapper mallProductBuyMapper;
    private final MallMemberSpeakMapper mallMemberSpeakMapper;
    private final MallMemberChargeMapper mallMemberChargeMapper;


    @Value("${spring.profiles.active}")
@@ -276,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(),
@@ -341,6 +342,26 @@
                DataDictionaryEnum.FCM_INSIDE_NFT_PERCENT.getCode()
        );
        mallMemberVo.setInsideNFTPercent(insideNFTPercentDic.getValue());

        DataDictionaryCustom chargeAddressDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.CHARGE_ADDRESS.getType(),
                DataDictionaryEnum.CHARGE_ADDRESS.getCode()
        );
        mallMemberVo.setChargeAddress(chargeAddressDic.getValue());

        DataDictionaryCustom withdrawAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.WITHDRAW_AMOUNT.getType(),
                DataDictionaryEnum.WITHDRAW_AMOUNT.getCode()
        );
        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);
        return new FebsResponse().success().data(mallMemberVo);
    }

@@ -937,7 +958,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());
@@ -1023,6 +1044,38 @@
        return new FebsResponse().success().data(pages);
    }

    @Override
    public FebsResponse chargeBalance(ApiChargeBalanceDto apiChargeBalanceDto) {
        Long memberId = LoginUserUtil.getLoginUser().getId();
        MallMember mallMember = this.baseMapper.selectById(memberId);
        BigDecimal amount = apiChargeBalanceDto.getAmount();
        DataDictionaryCustom chargeAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.CHARGE_AMOUNT.getType(),
                DataDictionaryEnum.CHARGE_AMOUNT.getCode()
        );
        BigDecimal chargeAmount = new BigDecimal(chargeAmountDic.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
        if(chargeAmount.compareTo(amount) > 0){
            throw new FebsException("充值金额需要大于"+chargeAmount);
        }

        if (StrUtil.isBlank(mallMember.getTradePassword())) {
            throw new FebsException("请设置交易密码");
        }

        if (!mallMember.getTradePassword().equals(SecureUtil.md5(apiChargeBalanceDto.getTradePassword()))) {
            throw new FebsException("交易密码错误");
        }
        MallMemberCharge mallMemberCharge = new MallMemberCharge();
        mallMemberCharge.setMemberId(memberId);
        mallMemberCharge.setAmount(amount);
        mallMemberCharge.setAddress(apiChargeBalanceDto.getAddress());
        mallMemberCharge.setState(1);
        mallMemberChargeMapper.insert(mallMemberCharge);


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

//    public static void main(String[] args) {
//        Set<String> objectsAccount = new HashSet<>();
//        Set<String> objects = new HashSet<>();