新政策

11 months ago · 1881d96b5e
2 changed files with 6 additions and 6 deletions
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/revenuereward/RevenueRewardEventHandler.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/revenuereward/RevenueRewardEventHandler.java
@ -274,8 +274,8 @@ public class RevenueRewardEventHandler extends BaseApplicationService {
                    RevenueReward storeRevenueReward = revenueRewardQueryService.queryByOrgId(store.getOrgId());
                    if (!storeRevenueReward.getAllRecoveryRequirement()) {
                        //未回本 拿100% 20%推荐费+50%门店费用+ 30%回本补贴
-                        rewardApplicationService.handleStoreRecommendMatchmakerFee(store.getOrgId(), mq.getMatchmakerName(), associateOrder.getSettlementAmount(), RewardTypeEnum.OPERATING_RECOMMEND_50);
-                        rewardApplicationService.handleStoreRecommendMatchmakerFee(store.getOrgId(), mq.getMatchmakerName(), associateOrder.getSettlementAmount(), RewardTypeEnum.PAYBACK_SUBSIDY_30);
+                        rewardApplicationService.handleStoreRecommendMatchmakerFee(store.getOrgId(), associateOrder.getOrderBelongName(), associateOrder.getSettlementAmount(), RewardTypeEnum.OPERATING_RECOMMEND_50);
+                        rewardApplicationService.handleStoreRecommendMatchmakerFee(store.getOrgId(), associateOrder.getOrderBelongName(), associateOrder.getSettlementAmount(), RewardTypeEnum.PAYBACK_SUBSIDY_30);

                        //发送事件 检查是否满足回本要求
                        RevenueReward stRevenueReward = revenueRewardQueryService.queryByOrgId(store.getOrgId());
@ -283,14 +283,14 @@ public class RevenueRewardEventHandler extends BaseApplicationService {
                        handle(storeReEvent);
                    } else {
                        //回本后 拿70%  20%推荐费+50%门店费用
-                        rewardApplicationService.handleStoreRecommendMatchmakerFee(store.getOrgId(), mq.getMatchmakerName(), associateOrder.getSettlementAmount(), RewardTypeEnum.OPERATING_RECOMMEND_50);
+                        rewardApplicationService.handleStoreRecommendMatchmakerFee(store.getOrgId(), associateOrder.getOrderBelongName(), associateOrder.getSettlementAmount(), RewardTypeEnum.OPERATING_RECOMMEND_50);
                        //发送事件 检查是否满足回本要求
                        RevenueReward stRevenueReward = revenueRewardQueryService.queryByOrgId(store.getOrgId());
                        RevenueRewardUpdatedEvent storeReEvent = new RevenueRewardUpdatedEvent(stRevenueReward.getId());
                        handle(storeReEvent);

                        //区域分润
-                        rewardApplicationService.handleStoreRecommendMatchmakerFee(store.getOperationCenterOrgId(), mq.getMatchmakerName(), associateOrder.getSettlementAmount(), RewardTypeEnum.SERVICE_PROVIDER_MANAGEMENT_FEE);
+                        rewardApplicationService.handleStoreRecommendMatchmakerFee(store.getOperationCenterOrgId(), associateOrder.getOrderBelongName(), associateOrder.getSettlementAmount(), RewardTypeEnum.SERVICE_PROVIDER_MANAGEMENT_FEE);
                        //发送事件 检查是否满足回本要求
                        RevenueReward operationCenterRevenueReward = revenueRewardQueryService.queryByOrgId(store.getOperationCenterOrgId());
                        RevenueRewardUpdatedEvent operationCenterReEvent = new RevenueRewardUpdatedEvent(operationCenterRevenueReward.getId());
--- 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
@ -242,7 +242,7 @@ public class RewardApplicationService extends BaseApplicationService {
    }

    public void handleStoreRecommendMatchmakerFee(Long orgId,
-                                                  String serviceProviderName,
+                                                  String name,
                                                  BigDecimal franchiseFee,
                                                  RewardTypeEnum rewardType) {
        //服务商管理费
@ -252,7 +252,7 @@ public class RewardApplicationService extends BaseApplicationService {
        //线下收益
        RevenueRewardRecord revenueRewardRecord = RevenueRewardRecord.build(TradeTypeEnum.MATCHMAKER_JOIN_RECOMMEND_FEE, TradeSceneEnum.ONLINE,
                revenue, new BigDecimal(rewardConfig.getValue()), BigDecimal.ZERO, revenue, franchiseFee);
-        revenueRewardRecord.handleContent(Collections.singletonList(serviceProviderName));
+        revenueRewardRecord.handleContent(Collections.singletonList(name));
        if (RewardTypeEnum.PAYBACK_SUBSIDY_30.equals(rewardType)) {
            revenueRewardRecord.setContent(revenueRewardRecord.getContent() + "回本补贴");
        }