From 0066395d8a6ea70d622e5173144e9dee2c7a8f1e Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 28 Nov 2023 10:30:02 +0800
Subject: [PATCH] 匹配
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 d5d9174..6c626f7 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
@@ -114,7 +114,7 @@
throw new FebsException("预约超时");
}
MallProductBuy mallProductBuy = mallProductBuyMapper.selectMemberIdAndNFTIdAndStateAndMateState(
- memberId,productNFTId,ProductEnum.PRODUCT_BUY_ON_GOING.getValue(),null);
+ memberId,productNFTId,ProductEnum.PRODUCT_BUY_ON_GOING.getValue(),ProductEnum.PRODUCT_BUY_MATE_STATE_FAIL.getValue());
if(ObjectUtil.isNotEmpty(mallProductBuy)){
throw new FebsException("不可重复预约");
}
@@ -134,7 +134,8 @@
mallProductBuy.setState(ProductEnum.PRODUCT_BUY_ON_GOING.getValue());
mallProductBuy.setMateState(ProductEnum.PRODUCT_BUY_MATE_STATE_FAIL.getValue());
mallProductBuy.setNftTotal(mallProductNft.getPriceNft());
- mallProductBuy.setNftAva(BigDecimal.ZERO);
+ mallProductBuy.setNftAva(mallProductNft.getPriceNft());
+// mallProductBuy.setNftAva(BigDecimal.ZERO);
mallProductBuyMapper.insert(mallProductBuy);
//令牌 可用减少，冻结增加
mallMemberAmount.setTokenAva(mallMemberAmount.getTokenAva().subtract(priceToken));
@@ -215,8 +216,9 @@
FlowTypeNewEnum.FCM_COIN.getValue(),
MoneyFlowTypeNewEnum.FCM_OUT_FEE.getDescrition());
- mallMemberAmount.setTrendsNft(mallMemberAmount.getTrendsNft().add(nftCnt));
- mallMemberAmountMapper.updateTrendsNftById(mallMemberAmount);
+ MallMemberAmount mallMemberAmountNft = mallMemberAmountMapper.selectByMemberId(memberId);
+ mallMemberAmountNft.setTrendsNft(mallMemberAmountNft.getTrendsNft().add(nftCnt));
+ mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountNft);
String orderNoNFT = MallUtils.getOrderNum("NFT");
iMallMoneyFlowService.addMoneyFlow(
memberId,
@@ -287,8 +289,13 @@
mallMemberAmount.setTrendsNft(mallMemberAmount.getTrendsNft().subtract(nftCnt));
mallMemberAmountMapper.updateTrendsNftById(mallMemberAmount);
- mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().add(nftCntAva));
- mallMemberAmountMapper.updateFrozenNftById(mallMemberAmount);
+ MallMemberAmount mallMemberAmountFcm = mallMemberAmountMapper.selectByMemberId(memberId);
+ mallMemberAmountFcm.setFcmCntAva(mallMemberAmountFcm.getFcmCntAva().subtract(fcmFeeCnt));
+ mallMemberAmountMapper.updateFcmCntAvaById(mallMemberAmountFcm);
+
+ MallMemberAmount mallMemberAmountFrozenNFT = mallMemberAmountMapper.selectByMemberId(memberId);
+ mallMemberAmountFrozenNFT.setFrozenNft(mallMemberAmountFrozenNFT.getFrozenNft().add(nftCntAva));
+ mallMemberAmountMapper.updateFrozenNftById(mallMemberAmountFrozenNFT);
iMallMoneyFlowService.addMoneyFlow(
memberId,
nftCnt.negate(),
@@ -299,6 +306,14 @@
MoneyFlowTypeNewEnum.NFT_OUT.getDescrition());
iMallMoneyFlowService.addMoneyFlow(
memberId,
+ fcmFeeCnt.negate(),
+ MoneyFlowTypeNewEnum.NFT_OUT_FEE_FCM.getValue(),
+ orderNo,
+ mallMember.getId(),
+ FlowTypeNewEnum.FCM_COIN.getValue(),
+ MoneyFlowTypeNewEnum.NFT_OUT_FEE_FCM.getDescrition());
+ iMallMoneyFlowService.addMoneyFlow(
+ memberId,
nftFee.negate(),
MoneyFlowTypeNewEnum.NFT_OUT_FEE.getValue(),
orderNo,
--
Gitblit v1.9.1