From b52d29b99c0808b23a6f07bdc87db31e5ba11a31 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 13 May 2024 10:10:15 +0800
Subject: [PATCH] 新合约
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 099ea81..78e304c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/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(),
@@ -348,6 +348,13 @@
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);
return new FebsResponse().success().data(mallMemberVo);
}
@@ -1053,7 +1060,7 @@
}
MallMemberCharge mallMemberCharge = new MallMemberCharge();
mallMemberCharge.setMemberId(memberId);
- mallMemberCharge.setAmount(chargeAmount);
+ mallMemberCharge.setAmount(amount);
mallMemberCharge.setAddress(apiChargeBalanceDto.getAddress());
mallMemberCharge.setState(1);
mallMemberChargeMapper.insert(mallMemberCharge);
--
Gitblit v1.9.1