悬赏招亲

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<MarriageBountyOrderRewardReceiveRecord> 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());