From d86ff9906818e072f3daa206d7e49876f9e21cdd Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 15 Oct 2024 18:49:59 +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 | 4 ++-- .../service/reward/RewardApplicationService.java | 6 +++--- 2 files changed, 5 insertions(+), 5 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 32f57f7..6cfaca3 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 @@ -79,7 +79,7 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic Map rewardOriginalPriceMap = new HashMap<>(); Map rewardSettlementPriceMap = new HashMap<>(); //订单关系 - MarriageBountyOrderRel orderRel = MarriageBountyOrderRel.build(orderId, order.getSettlementAmount()); + MarriageBountyOrderRel orderRel = MarriageBountyOrderRel.build(orderId, order.getOriginalAmount()); marriageBountyOrder.setOrderRelList(Collections.singletonList(orderRel)); //悬赏招亲订单产品记录 MarriageBountyOrderProductRecord productRecord = new MarriageBountyOrderProductRecord(); @@ -116,7 +116,7 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic MarriageBountyOrderStatusEnum.INIT, MarriageBountyOrderPaymentStatusEnum.INIT); if (Objects.nonNull(marriageBountyOrder)) { //订单关系 - MarriageBountyOrderRel orderRel = MarriageBountyOrderRel.build(orderId, order.getSettlementAmount()); + MarriageBountyOrderRel orderRel = MarriageBountyOrderRel.build(orderId, order.getOriginalAmount()); marriageBountyOrder.setOrderRelList(Collections.singletonList(orderRel)); //悬赏招亲订单奖励 List orderRewardList = new ArrayList<>(); 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 79aff74..03da5c0 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 @@ -82,7 +82,7 @@ public class RewardApplicationService { BigDecimal revenue = recommendRewardConfig.calculateReward(rewardAmount); rewardAmount = rewardAmount.subtract(revenue); RevenueRewardRecord revenueRewardRecord = RevenueRewardRecord.build(TradeTypeEnum.MATCHMAKER_JOIN_RECOMMEND_FEE, - revenue, revenue, associateOrder.getSettlementAmount()); + revenue, revenue, associateOrder.getOriginalAmount()); revenueRewardRecord.handleContent(Collections.singletonList(StrUtil.isNotBlank(associateOrder.getOrderBelongName()) ? associateOrder.getOrderBelongName() : "")); RevenueRewardAssociateOrderRecord associateOrderRecord = RevenueRewardAssociateOrderRecord.build(associateOrder.getId(), associateOrder.getSettlementAmount()); revenueRewardRecord.setAssociateOrderRecordList(Collections.singletonList(associateOrderRecord)); @@ -108,7 +108,7 @@ public class RewardApplicationService { //营收额 BigDecimal revenue = recommendRewardConfig.calculateReward(rewardAmount); RevenueRewardRecord revenueRewardRecord = RevenueRewardRecord.build(TradeTypeEnum.MATCHMAKER_JOIN_RECOMMEND_FEE, - revenue, revenue, associateOrder.getSettlementAmount()); + revenue, revenue, associateOrder.getOriginalAmount()); revenueRewardRecord.handleContent(Collections.singletonList(StrUtil.isNotBlank(associateOrder.getOrderBelongName()) ? associateOrder.getOrderBelongName() : "")); RevenueRewardAssociateOrderRecord associateOrderRecord = RevenueRewardAssociateOrderRecord.build(associateOrder.getId(), associateOrder.getSettlementAmount()); revenueRewardRecord.setAssociateOrderRecordList(Collections.singletonList(associateOrderRecord)); @@ -134,7 +134,7 @@ public class RewardApplicationService { //营收额 BigDecimal revenue = recommendRewardConfig.calculateReward(rewardAmount); RevenueRewardRecord revenueRewardRecord = RevenueRewardRecord.build(TradeTypeEnum.MATCHMAKER_JOIN_RECOMMEND_FEE, - revenue, revenue, associateOrder.getSettlementAmount()); + revenue, revenue, associateOrder.getOriginalAmount()); revenueRewardRecord.handleContent(Collections.singletonList(StrUtil.isNotBlank(associateOrder.getOrderBelongName()) ? associateOrder.getOrderBelongName() : "")); RevenueRewardAssociateOrderRecord associateOrderRecord = RevenueRewardAssociateOrderRecord.build(associateOrder.getId(), associateOrder.getSettlementAmount()); revenueRewardRecord.setAssociateOrderRecordList(Collections.singletonList(associateOrderRecord));