From 97972b873f6d9447cc346666f1a681d137e3969f Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Mon, 27 Nov 2023 15:48:22 +0800 Subject: [PATCH] 匹配 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java | 8 ++++---- src/main/resources/mapper/modules/MallMemberAmountMapper.xml | 10 +++++----- src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java index 5fca52d..49b39ec 100644 --- a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java +++ b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java @@ -10,6 +10,7 @@ **/ @Getter public enum MoneyFlowTypeNewEnum { + NFT_OUT_FEE_FCM(14,"NFT提现FCM手续费"), TOKEN_BUY_FROZEN_RETURN(13,"预约令牌"), PAY(12,"支付"), NFT_OUT_FEE(11,"NFT提现手续费"), 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 ad8e578..c6ea08f 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 @@ -303,12 +303,12 @@ MoneyFlowTypeNewEnum.NFT_OUT.getDescrition()); iMallMoneyFlowService.addMoneyFlow( memberId, - nftFee.negate(), - MoneyFlowTypeNewEnum.NFT_OUT_FEE.getValue(), + fcmFeeCnt.negate(), + MoneyFlowTypeNewEnum.NFT_OUT_FEE_FCM.getValue(), orderNo, mallMember.getId(), - FlowTypeNewEnum.NFT.getValue(), - MoneyFlowTypeNewEnum.NFT_OUT_FEE.getDescrition()); + FlowTypeNewEnum.FCM_COIN.getValue(), + MoneyFlowTypeNewEnum.NFT_OUT_FEE_FCM.getDescrition()); iMallMoneyFlowService.addMoneyFlow( memberId, nftFee.negate(), diff --git a/src/main/resources/mapper/modules/MallMemberAmountMapper.xml b/src/main/resources/mapper/modules/MallMemberAmountMapper.xml index 86f5f15..f356176 100644 --- a/src/main/resources/mapper/modules/MallMemberAmountMapper.xml +++ b/src/main/resources/mapper/modules/MallMemberAmountMapper.xml @@ -8,21 +8,21 @@ <update id="updateFcmCntAvaById"> update mall_member_amount - set revision = revision + 1, + set fcm_cnt_ava = #{record.fcmCntAva} where id = #{record.id} and revision=#{record.revision} </update> <update id="updateTokenAvaById"> update mall_member_amount - set revision = revision + 1, + set token_ava = #{record.tokenAva} where id = #{record.id} and revision=#{record.revision} </update> <update id="updateTokenAvaAndTokenFrozenById"> update mall_member_amount - set revision = revision + 1, + set token_ava = #{record.tokenAva}, token_frozen = #{record.tokenFrozen} where id = #{record.id} and revision=#{record.revision} @@ -30,14 +30,14 @@ <update id="updateTrendsNftById"> update mall_member_amount - set revision = revision + 1, + set trends_nft = #{record.trendsNft} where id = #{record.id} and revision=#{record.revision} </update> <update id="updateFrozenNftById"> update mall_member_amount - set revision = revision + 1, + set frozen_nft = #{record.frozenNft} where id = #{record.id} and revision=#{record.revision} </update> -- Gitblit v1.9.1