新政策

dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/revenuereward/RevenueRewardEventHandler.java

@@ -150,7 +150,7 @@ public class RevenueRewardEventHandler extends BaseApplicationService {
         revenueRewardRecoveredRecordDao.insert(recoveredRecord);
         //补充管道收益 PIPELINE_REVENUE  全回本后才有管道收益
         if (revenueReward.getAllRecoveryRequirement()) {
-            revenueRewardApplicationService.pipeLineRevenue(orgId, revenueRewardRecord, TradeSceneEnum.OFFLINE);
+            revenueRewardApplicationService.pipeLineRevenue(orgId, revenueRewardRecord, TradeSceneEnum.OFFLINE,revenueRewardRecord.getContent());
         }
         //发送事件 检查是否满足回本要求
         RevenueRewardUpdatedEvent reEvent = new RevenueRewardUpdatedEvent(revenueReward.getId());

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/revenuereward/RevenueRewardApplicationService.java

@@ -2,7 +2,6 @@ package com.qniao.dam.application.service.revenuereward;
 
 import com.qniao.dam.domain.aggregate.revenuereward.RevenueRewardAggregate;
 import com.qniao.dam.domain.aggregate.revenuereward.entity.RevenueReward;
-import com.qniao.dam.domain.aggregate.revenuereward.valueobj.RevenueRewardAssociateOrderRecord;
 import com.qniao.dam.domain.aggregate.revenuereward.valueobj.RevenueRewardRecord;
 import com.qniao.dam.domain.aggregate.rewardconfig.entity.RewardConfig;
 import com.qniao.dam.domain.aggregate.walletaccount.entity.WalletAccount;
@@ -75,10 +74,11 @@ public class RevenueRewardApplicationService {
      * 管道收益
      *
      * @param serviceProviderOrgId
+     * @param content
      */
     public void pipeLineRevenue(Long serviceProviderOrgId,
                                 RevenueRewardRecord rewardRecord,
-                                TradeSceneEnum tradeScene) {
+                                TradeSceneEnum tradeScene, String content) {
         try {
             Organization organization = organizationDao.selectById(serviceProviderOrgId);
             Long recommendServiceProviderOrgId = null;
@@ -103,7 +103,7 @@ public class RevenueRewardApplicationService {
                 RevenueReward revenueReward = revenueRewardQueryService.queryByOrgId(recommendServiceProviderOrgId);
                 RevenueRewardRecord revenueRewardRecord = RevenueRewardRecord.build(TradeTypeEnum.PIPELINE_REVENUE_FEE, tradeScene,
                         revenue, new BigDecimal(rewardConfig.getValue()), BigDecimal.ZERO, revenue, rewardRecord.getEarnings());
-                revenueRewardRecord.setContent(revenueRewardRecord.getContent() + "管道收益");
+                revenueRewardRecord.setContent(content + "管道收益");
                 revenueRewardRecord.setAssociateRevenueRewardRecordId(rewardRecord.getId());
                 revenueReward.setRecordList(Collections.singletonList(revenueRewardRecord));
 

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/reward/RewardApplicationService.java

@@ -5,11 +5,9 @@ import cn.hutool.core.util.StrUtil;
 import com.qniao.dam.api.command.reward.user.request.AcquireMatchmakerConfirmMatchRewardDto;
 import com.qniao.dam.api.command.reward.user.request.AcquireMatchmakerConfirmMeetingRewardDto;
 import com.qniao.dam.api.command.reward.user.request.UserAcquireMatchmakerJoinRecommendRewardDto;
-import com.qniao.dam.application.handler.revenuereward.RevenueRewardEventHandler;
 import com.qniao.dam.application.service.revenuereward.RevenueRewardApplicationService;
 import com.qniao.dam.domain.aggregate.ffpm.FranchiseFeeProfitManagementAggregate;
 import com.qniao.dam.domain.aggregate.ffpm.entity.FranchiseFeeProfitManagement;
-import com.qniao.dam.domain.aggregate.marriagebounty.entity.MarriageBountyOrder;
 import com.qniao.dam.domain.aggregate.revenuereward.RevenueRewardAggregate;
 import com.qniao.dam.domain.aggregate.revenuereward.entity.RevenueReward;
 import com.qniao.dam.domain.aggregate.revenuereward.valueobj.RevenueRewardAssociateOrderRecord;
@@ -20,7 +18,6 @@ import com.qniao.dam.domian.aggregate.ffpm.constant.FranchiseFeeProfitManagement
 import com.qniao.dam.domian.aggregate.matchmaker.event.MatchmakerFranchiseFeeRewardEvent;
 import com.qniao.dam.domian.aggregate.pointaccount.event.PointRewardCreatedMQ;
 import com.qniao.dam.domian.aggregate.prc.constant.PointRewardConfigTypeEnum;
-import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum;
 import com.qniao.dam.domian.aggregate.revenuereward.event.RevenueRewardUpdatedEvent;
 import com.qniao.dam.domian.aggregate.walletaccount.constant.IdentityTypeEnum;
 import com.qniao.dam.domian.aggregate.walletaccount.constant.TradeSceneEnum;
@@ -34,12 +31,10 @@ import com.qniao.dam.query.store.StoreQueryService;
 import com.qniao.dam.query.walletaccount.WalletAccountQueryService;
 import com.qniao.dam.domain.aggregate.order.entity.Order;
 import com.qniao.dam.domain.aggregate.rewardconfig.entity.RewardConfig;
-import com.qniao.dam.domain.aggregate.walletaccount.WalletAccountAggregate;
 import com.qniao.dam.domain.aggregate.walletaccount.entity.WalletAccount;
 import com.qniao.dam.domain.aggregate.walletaccount.valueobj.WalletAccountRecord;
 import com.qniao.dam.domian.aggregate.rewardconfig.constant.RewardTypeEnum;
 import com.qniao.dam.domian.aggregate.walletaccount.constant.TradeTypeEnum;
-import com.qniao.dam.query.order.OrderQueryService;
 import com.qniao.dam.query.rewardconfig.RewardConfigQueryService;
 import com.qniao.das.domian.aggregate.marriageinformation.MarriageInformation;
 import com.qniao.das.domian.aggregate.mntp.entity.MatchmakerNoviceTaskProgress;
@@ -264,7 +259,7 @@ public class RewardApplicationService extends BaseApplicationService {
         revenueRewardRecoveredRecordDao.insert(recoveredRecord);
         //补充管道收益 PIPELINE_REVENUE  全回本后才有管道收益
         if (revenueReward.getAllRecoveryRequirement()) {
-            revenueRewardApplicationService.pipeLineRevenue(orgId, revenueRewardRecord, TradeSceneEnum.OFFLINE);
+            revenueRewardApplicationService.pipeLineRevenue(orgId, revenueRewardRecord, TradeSceneEnum.OFFLINE, revenueRewardRecord.getContent());
         }
     }