悬赏招亲

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<Integer, BigDecimal> rewardOriginalPriceMap = new HashMap<>();
                 Map<Integer, BigDecimal> 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<MarriageBountyOrderReward> orderRewardList = new ArrayList<>();

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