From 9fb243b3d520ca82b6806a0231b33fc0026fb3ca Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 29 Apr 2024 16:20:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/service/reward/RewardApplicationService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/reward/RewardApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/reward/RewardApplicationService.java index f5105a5..a882e12 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/reward/RewardApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/reward/RewardApplicationService.java @@ -1,5 +1,6 @@ package com.qniao.dam.application.service.reward; +import cn.hutool.core.util.StrUtil; import com.qniao.dam.api.command.reward.user.request.UserAcquireMatchmakerJoinRecommendRewardDto; import com.qniao.dam.query.walletaccount.WalletAccountQueryService; import com.qniao.dam.domain.aggregate.order.entity.Order; @@ -46,9 +47,9 @@ public class RewardApplicationService { walletAccount = WalletAccount.init(dto.getInitiatorUserId()); } BigDecimal rewardAmount = rewardConfig.calculate(associateOrder.getSettlementAmount()); - String content = "推荐红娘" + associateOrder.getOrderBelongName() + "入驻平台"; + String content = "推荐红娘" + (StrUtil.isNotBlank(associateOrder.getOrderBelongName()) ? associateOrder.getOrderBelongName() : "") + "入驻平台"; walletAccount.setAvailableBalance(walletAccount.getAvailableBalance().add(rewardAmount)); - walletAccount.setTotalBalance(walletAccount.getAvailableBalance().add(rewardAmount)); + walletAccount.setTotalBalance(walletAccount.getAvailableBalance().add(walletAccount.getFrozenBalance())); WalletAccountRecord record = WalletAccountRecord.build(TradeTypeEnum.MATCHMAKER_JOIN_RECOMMEND_FEE, rewardAmount, true, content, TradeTypeEnum.MATCHMAKER_JOIN_RECOMMEND_FEE.getDesc()); WalletAccountAssociateOrderRecord associateOrderRecord = WalletAccountAssociateOrderRecord.build(associateOrder.getId(), associateOrder.getSettlementAmount());