关闭订单确认赠送GFD

KKSU

2024-05-24 b922c159f4791e940ff4b017848e4998d3b44e1b

 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,13 @@
        );
        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);
    }

@@ -951,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());
@@ -1060,7 +1067,7 @@
        }
        MallMemberCharge mallMemberCharge = new MallMemberCharge();
        mallMemberCharge.setMemberId(memberId);
        mallMemberCharge.setAmount(chargeAmount);
        mallMemberCharge.setAmount(amount);
        mallMemberCharge.setAddress(apiChargeBalanceDto.getAddress());
        mallMemberCharge.setState(1);
        mallMemberChargeMapper.insert(mallMemberCharge);