From 1ce0aef813257a1c8949371fb1fbf3df7a3e87d7 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 30 Nov 2023 17:01:49 +0800
Subject: [PATCH] 预约列表
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
index d77b875..1f2f630 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
@@ -89,9 +89,9 @@
* 预约，验证交易密码、预约产品是否开启状态、该产品是否已经预约、token是否足够
* 冻结对应的令牌数量、生成预约记录、生成流水记录
*/
- Integer isFrozen = mallMember.getIsFrozen();
- if(ProductEnum.MEMBER_UNFROZEN.getValue() != isFrozen){
- throw new FebsException("账户无法预约");
+ Boolean aBoolean = operationPermissionMemberFrozen(memberId);
+ if(aBoolean){
+ throw new FebsException("用户已冻结");
}
DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
@@ -169,6 +169,11 @@
* 计算手续费、减少用户的fcm余额
* 增加流水
*/
+
+ Boolean aBoolean = operationPermissionMemberFrozen(memberId);
+ if(aBoolean){
+ throw new FebsException("用户已冻结");
+ }
if(!tradePassword.equals(mallMember.getTradePassword())){
throw new FebsException("请输入正确的交易密码");
}
@@ -249,6 +254,11 @@
* 计算手续费、减少动态NFT、增加冻结NFT
* 增加流水
*/
+
+ Boolean aBoolean = operationPermissionMemberFrozen(memberId);
+ if(aBoolean){
+ throw new FebsException("用户已冻结");
+ }
if(!tradePassword.equals(mallMember.getTradePassword())){
throw new FebsException("请输入正确的交易密码");
}
@@ -271,21 +281,23 @@
BigDecimal nftFeePercent = ObjectUtil.isEmpty(nftFeeDic) ? new BigDecimal(20) : new BigDecimal(nftFeeDic.getValue());
nftFeePercent = nftFeePercent.divide(new BigDecimal(100),4,BigDecimal.ROUND_DOWN);
BigDecimal nftFee = nftCnt.multiply(nftFeePercent);
- BigDecimal nftCntAva = nftCnt.subtract(nftFee);
-
DataDictionaryCustom fcmPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.FCM_PRICE.getType(),
DataDictionaryEnum.FCM_PRICE.getCode());
BigDecimal fcmPrice = ObjectUtil.isEmpty(fcmPriceDic) ? new BigDecimal(2) : new BigDecimal(fcmPriceDic.getValue());
BigDecimal fcmFeeCnt = nftFee.divide(fcmPrice, 2, BigDecimal.ROUND_DOWN);
+ if(BigDecimal.ZERO.compareTo(mallMemberAmount.getTrendsNft()) >= 0
+ || fcmFeeCnt.compareTo(mallMemberAmount.getFcmCntAva()) > 0){
+ throw new FebsException("手续费不足");
+ }
String orderNo = MallUtils.getOrderNum("NFT");
MallProductSell mallProductSell = new MallProductSell();
mallProductSell.setMemberId(memberId);
mallProductSell.setOrderNo(orderNo);
mallProductSell.setNftTotal(nftCnt);
- mallProductSell.setNftCnt(nftCntAva);
- mallProductSell.setNftCntAva(nftCntAva);
+ mallProductSell.setNftCnt(nftCnt);
+ mallProductSell.setNftCntAva(nftCnt);
mallProductSell.setNftFee(nftFee);
mallProductSell.setFcmFee(fcmFeeCnt);
mallProductSell.setState(ProductEnum.PRODUCT_SELL_ON_GOING.getValue());
@@ -299,7 +311,7 @@
mallMemberAmountMapper.updateFcmCntAvaById(mallMemberAmountFcm);
MallMemberAmount mallMemberAmountFrozenNFT = mallMemberAmountMapper.selectByMemberId(memberId);
- mallMemberAmountFrozenNFT.setFrozenNft(mallMemberAmountFrozenNFT.getFrozenNft().add(nftCntAva));
+ mallMemberAmountFrozenNFT.setFrozenNft(mallMemberAmountFrozenNFT.getFrozenNft().add(nftCnt));
mallMemberAmountMapper.updateFrozenNftById(mallMemberAmountFrozenNFT);
iMallMoneyFlowService.addMoneyFlow(
memberId,
@@ -317,15 +329,6 @@
mallMember.getId(),
FlowTypeNewEnum.FCM_COIN.getValue(),
MoneyFlowTypeNewEnum.NFT_OUT_FEE_FCM.getDescrition());
- iMallMoneyFlowService.addMoneyFlow(
- memberId,
- nftFee.negate(),
- MoneyFlowTypeNewEnum.NFT_OUT_FEE.getValue(),
- orderNo,
- mallMember.getId(),
- FlowTypeNewEnum.NFT.getValue(),
- MoneyFlowTypeNewEnum.NFT_OUT_FEE.getDescrition());
-
agentProducer.sendFcmNFTExchangeMsg(fcmFeeCnt.toString());
return new FebsResponse().success();
}
@@ -428,6 +431,11 @@
* 更新卖单状态
* 生成流水信息
*/
+
+ Boolean aBoolean = operationPermissionMemberFrozen(memberId);
+ if(aBoolean){
+ throw new FebsException("用户已冻结");
+ }
if(!tradePassword.equals(mallMember.getTradePassword())){
throw new FebsException("请输入正确的交易密码");
}
@@ -486,6 +494,11 @@
* 更新卖单状态
* 生成流水信息
*/
+
+ Boolean aBoolean = operationPermissionMemberFrozen(memberId);
+ if(aBoolean){
+ throw new FebsException("用户已冻结");
+ }
if(!tradePassword.equals(mallMember.getTradePassword())){
throw new FebsException("请输入正确的交易密码");
}
@@ -525,4 +538,13 @@
IPage<ApiOrderBuyVo> apiOrderBuyVoIPage = mallProductBuyMapper.selectBuyListInPage(page, apiOrderBuyDto);
return new FebsResponse().success().data(apiOrderBuyVoIPage);
}
+
+ @Override
+ public Boolean operationPermissionMemberFrozen(Long memberId) {
+ MallMember mallMember = memberMapper.selectById(memberId);
+ if(ProductEnum.MEMBER_FROZEN.getValue() == mallMember.getIsFrozen()){
+ return true;
+ }
+ return false;
+ }
}
--
Gitblit v1.9.1