From 09fb54808d1dfe10ae7d84b56a8c140b34d3b320 Mon Sep 17 00:00:00 2001 From: Derran Date: Fri, 11 Oct 2024 15:21:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E8=B5=8F=E6=8B=9B=E4=BA=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarriageBountyOrderApplicationService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java index 58bac5e..98bd508 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java @@ -21,6 +21,7 @@ import com.qniao.dam.domain.aggregate.productspec.entity.ProductSpec; import com.qniao.dam.domain.aggregate.rewardconfig.entity.RewardConfig; import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderPaymentStatusEnum; import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderStatusEnum; +import com.qniao.dam.domian.aggregate.marriagebount.constant.PublishIdentityTypeEnum; import com.qniao.dam.domian.aggregate.paymentorder.constant.PaymentOrderStatusEnum; import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; import com.qniao.dam.domian.aggregate.rewardconfig.constant.RewardTypeEnum; @@ -294,8 +295,8 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic marriageBountyOrder.setId(marriageBountyOrderId); marriageBountyOrderReward.setIsReceive(true); List rewardReceiveRecordList = new ArrayList<>(); - //分润 发榜嘉宾实名认证 - if (Objects.nonNull(rewardInviteUserId)) { + //分润 发榜嘉宾实名认证 红娘发布的榜单已经扣除佣金 + if (Objects.nonNull(rewardInviteUserId) && PublishIdentityTypeEnum.GUEST.equals(existMarriageBountyOrder.getPublishType())) { RewardConfig guestCertificationReward = rewardConfigQueryService.queryGuestCertificationReward(rewardInviteUserId); if (Objects.nonNull(guestCertificationReward)) { BigDecimal receivedAmount = guestCertificationReward.calculateReward(marriageBountyOrderReward.getRewardAmount()); @@ -318,8 +319,8 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic } - //分润 发布悬赏招亲 - if (Objects.nonNull(rewardPublishMatchmakerUserId)) { + //分润 发布悬赏招亲 红娘发布的榜单已经扣除佣金 + if (Objects.nonNull(rewardPublishMatchmakerUserId) && PublishIdentityTypeEnum.GUEST.equals(existMarriageBountyOrder.getPublishType())) { RewardConfig publishMarriageBountyReward = rewardConfigQueryService.queryPublishMarriageBountyReward(rewardPublishMatchmakerUserId); if (Objects.nonNull(publishMarriageBountyReward)) { BigDecimal receivedAmount = publishMarriageBountyReward.calculateReward(marriageBountyOrderReward.getRewardAmount());