diff --git 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 index da1634c..9aa741e 100644 --- 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 @@ -245,6 +245,9 @@ public class RevenueRewardEventHandler extends BaseApplicationService { recommendServiceProviderOrgId = store.getRecommendServiceProviderOrgId(); } handleServiceProviderManagementFee(recommendServiceProviderOrgId, organization.getFullName(), franchiseFee, RewardTypeEnum.OPERATING_RECOMMEND_20); + + franchiseFeeProfitManagement.setIsFinish(true); + franchiseFeeProfitManagementAggregate.edit(franchiseFeeProfitManagement); } } catch (Exception e) { log.error("服务商回本事件处理异常"); @@ -296,6 +299,9 @@ public class RevenueRewardEventHandler extends BaseApplicationService { RevenueRewardUpdatedEvent operationCenterReEvent = new RevenueRewardUpdatedEvent(operationCenterRevenueReward.getId()); handle(operationCenterReEvent); } + + franchiseFeeProfitManagement.setIsFinish(true); + franchiseFeeProfitManagementAggregate.edit(franchiseFeeProfitManagement); } //todo 推荐的红娘不在一个门店中,收益是否归门店 diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/ffpm/impl/FranchiseFeeProfitManagementQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/ffpm/impl/FranchiseFeeProfitManagementQueryServiceImpl.java index aad13c8..3f64aa9 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/ffpm/impl/FranchiseFeeProfitManagementQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/ffpm/impl/FranchiseFeeProfitManagementQueryServiceImpl.java @@ -20,6 +20,7 @@ public class FranchiseFeeProfitManagementQueryServiceImpl implements FranchiseFe public FranchiseFeeProfitManagement queryByOrg(Long orgId) { return franchiseFeeProfitManagementDao.selectOne(new LambdaQueryWrapper() .eq(FranchiseFeeProfitManagement::getOrgId, orgId) + .eq(FranchiseFeeProfitManagement::getIsFinish, false) .last("limit 1")); }