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 e0ccabc..b536190 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 @@ -171,20 +171,22 @@ public class RewardApplicationService extends BaseApplicationService { handleStoreRecommendMatchmakerFee(store.getOrgId(), dto.getReceiveUserName(), rewardAmount, RewardTypeEnum.PAYBACK_SUBSIDY_30); //发送事件 检查是否满足回本要求 - RevenueRewardUpdatedEvent storeReEvent = new RevenueRewardUpdatedEvent(storeRevenueReward.getId()); + RevenueReward stRevenueReward = revenueRewardQueryService.queryByOrgId(dto.getStoreOrgId()); + RevenueRewardUpdatedEvent storeReEvent = new RevenueRewardUpdatedEvent(stRevenueReward.getId()); this.sendEvent(storeReEvent); } else { //回本后 拿70% 20%推荐费+50%门店费用 handleStoreRecommendMatchmakerFee(store.getOrgId(), dto.getReceiveUserName(), rewardAmount, RewardTypeEnum.OPERATING_RECOMMEND_50); //发送事件 检查是否满足回本要求 - RevenueRewardUpdatedEvent storeReEvent = new RevenueRewardUpdatedEvent(storeRevenueReward.getId()); + RevenueReward stRevenueReward = revenueRewardQueryService.queryByOrgId(dto.getStoreOrgId()); + RevenueRewardUpdatedEvent storeReEvent = new RevenueRewardUpdatedEvent(stRevenueReward.getId()); this.sendEvent(storeReEvent); //区域分润 handleStoreRecommendMatchmakerFee(store.getOperationCenterOrgId(), dto.getReceiveUserName(), rewardAmount, RewardTypeEnum.SERVICE_PROVIDER_MANAGEMENT_FEE); //发送事件 检查是否满足回本要求 - RevenueReward OperationCenterRevenueReward = revenueRewardQueryService.queryByOrgId(store.getOrgId()); - RevenueRewardUpdatedEvent OperationCenterReEvent = new RevenueRewardUpdatedEvent(OperationCenterRevenueReward.getId()); + RevenueReward operationCenterRevenueReward = revenueRewardQueryService.queryByOrgId(store.getOperationCenterOrgId()); + RevenueRewardUpdatedEvent OperationCenterReEvent = new RevenueRewardUpdatedEvent(operationCenterRevenueReward.getId()); this.sendEvent(OperationCenterReEvent); } } else { @@ -201,21 +203,23 @@ public class RewardApplicationService extends BaseApplicationService { //未回本 门店拿50% + 30%回本补贴 handleStoreRecommendMatchmakerFee(store.getOrgId(), dto.getReceiveUserName(), rewardAmount, RewardTypeEnum.OPERATING_RECOMMEND_50); handleStoreRecommendMatchmakerFee(store.getOrgId(), dto.getReceiveUserName(), rewardAmount, RewardTypeEnum.PAYBACK_SUBSIDY_30); - //发送事件 检查是否满足回本要求 - RevenueRewardUpdatedEvent storeReEvent = new RevenueRewardUpdatedEvent(storeRevenueReward.getId()); + //发送事件 检查是否满足回本要求. + RevenueReward stRevenueReward = revenueRewardQueryService.queryByOrgId(dto.getStoreOrgId()); + RevenueRewardUpdatedEvent storeReEvent = new RevenueRewardUpdatedEvent(stRevenueReward.getId()); this.sendEvent(storeReEvent); } else { //已回本 门店拿50% handleStoreRecommendMatchmakerFee(store.getOrgId(), dto.getReceiveUserName(), rewardAmount, RewardTypeEnum.OPERATING_RECOMMEND_50); //发送事件 检查是否满足回本要求 - RevenueRewardUpdatedEvent storeReEvent = new RevenueRewardUpdatedEvent(storeRevenueReward.getId()); + RevenueReward stRevenueReward = revenueRewardQueryService.queryByOrgId(dto.getStoreOrgId()); + RevenueRewardUpdatedEvent storeReEvent = new RevenueRewardUpdatedEvent(stRevenueReward.getId()); this.sendEvent(storeReEvent); //区域分润 handleStoreRecommendMatchmakerFee(store.getOperationCenterOrgId(), dto.getReceiveUserName(), rewardAmount, RewardTypeEnum.SERVICE_PROVIDER_MANAGEMENT_FEE); //发送事件 检查是否满足回本要求 - RevenueReward OperationCenterRevenueReward = revenueRewardQueryService.queryByOrgId(store.getOrgId()); - RevenueRewardUpdatedEvent OperationCenterReEvent = new RevenueRewardUpdatedEvent(OperationCenterRevenueReward.getId()); + RevenueReward operationCenterRevenueReward = revenueRewardQueryService.queryByOrgId(store.getOperationCenterOrgId()); + RevenueRewardUpdatedEvent OperationCenterReEvent = new RevenueRewardUpdatedEvent(operationCenterRevenueReward.getId()); this.sendEvent(OperationCenterReEvent); } } else {