直播红娘任务

dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardTypeEnum.java

@@ -147,24 +147,21 @@ public enum RewardTypeEnum {
     CHAT_PROFIT_PCT_50(604, "聊天收益百分比-50"),
 
     //红娘礼物收益
-    MATCHMAKER_PARTNER_GIFT_PCT(701, "高级红娘礼物收益百分比"),
+    CONTRACT_MATCHMAKER_GIFT_PCT(701, "签约红娘直播礼物收益百分比"),
 
-    MATCHMAKER_ONLINE_GIFT_PCT(702, "线上红娘礼物收益百分比"),
+    ONLINE_MATCHMAKER_GIFT_MIN_PCT(703, "在线红娘直播礼物收益最低百分比"),
 
-    MATCHMAKER_TRAINEE_GIFT_MIN_PCT(703, "实习红娘礼物收益最低百分比"),
+    ONLINE_MATCHMAKER_GIFT_MAX_PCT(704, "在线红娘直播收益最高百分比"),
 
-    MATCHMAKER_TRAINEE_GIFT_MAX_PCT(704, "实习红娘礼物收益最高百分比"),
+    TRAINEE_MATCHMAKER_GIFT_MIN_PCT(705, "实习红娘直播礼物收益最低百分比"),
 
-    MATCHMAKER_FREE_GIFT_MIN_PCT(705, "免费红娘礼物收益最低百分比"),
-
-    MATCHMAKER_FREE_GIFT_MAX_PCT(706, "免费红娘礼物收益最高百分比"),
+    TRAINEE_MATCHMAKER_GIFT_MAX_PCT(706, "实习红娘直播礼物收益最高百分比"),
 
     MATCHMAKER_GIFT_LADDER_PCT(707, "红娘礼物收益阶梯百分比"),
 
-    MATCHMAKER_PARTNER_RECOMMEND_COST_PCT(708, "高级红娘推荐消费收益百分比"),
-    MATCHMAKER_ONLINE_RECOMMEND_COST_PCT(709, "签约红娘推荐消费收益百分比"),
-    MATCHMAKER_TRAINEE_RECOMMEND_COST_PCT(710, "线上红娘推荐消费收益百分比"),
-    MATCHMAKER_FREE_RECOMMEND_COST_PCT(711, "实习红娘推荐消费收益百分比");
+    CONTRACT_MATCHMAKER_RECOMMEND_COST_PCT(708, "签约红娘推荐消费收益百分比"),
+    ONLINE_MATCHMAKER_RECOMMEND_COST_PCT(709, "线上红娘推荐消费收益百分比"),
+    TRAINEE_MATCHMAKER_RECOMMEND_COST_PCT(710, "实习红娘推荐消费收益百分比");
 
     @EnumValue
     @JsonValue

dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/virtualaccount/VirtualAccountEventHandler.java

@@ -15,12 +15,17 @@ import com.qniao.dam.domian.aggregate.walletaccount.constant.IdentityTypeEnum;
 import com.qniao.dam.domian.aggregate.walletaccount.constant.TradeSceneEnum;
 import com.qniao.dam.domian.aggregate.walletaccount.constant.TradeTypeEnum;
 import com.qniao.dam.infrastructure.persistent.dao.domain.MatchmakerDao;
+import com.qniao.dam.query.livematchmaker.LiveMatchmakerQueryService;
 import com.qniao.dam.query.matchmakermarriage.MatchmakerMarriageInformationQueryService;
+import com.qniao.dam.query.recommendationrelation.RecommendationRelationQueryService;
 import com.qniao.dam.query.revenuereward.RevenueRewardQueryService;
 import com.qniao.dam.query.rewardconfig.RewardConfigQueryService;
 import com.qniao.dam.query.walletaccount.WalletAccountQueryService;
 import com.qniao.das.domian.aggregate.matchmakermarriage.MatchmakerMarriageInformation;
+import com.qniao.das.domian.aggregate.recommendationrelation.entity.RecommendationRelation;
+import com.qniao.dau.domain.aggregate.livematchmaker.entity.LiveMatchmaker;
 import com.qniao.dau.domain.aggregate.matchmaker.entity.Matchmaker;
+import com.qniao.dau.domian.aggregate.lmar.constant.LiveMatchmakerTypeEnum;
 import com.qniao.domain.BaseApplicationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -47,55 +52,58 @@ public class VirtualAccountEventHandler extends BaseApplicationService {
     private WalletAccountQueryService walletAccountQueryService;
     @Resource
     private AcquireRevenueRewardDomainService acquireRevenueRewardDomainService;
+    @Resource
+    private LiveMatchmakerQueryService livematchmakerQueryService;
+    @Resource
+    private RecommendationRelationQueryService recommendationRelationQueryService;
 
     @Subscribe
     private void handle(VirtualAccountCostGiftEvent event) {
         try {
-            MatchmakerMarriageInformation marriageInformation = matchmakerMarriageInformationQueryService.queryByRecommend(event.getUserId());
-            if (Objects.nonNull(marriageInformation)) {
+            RecommendationRelation recommendationRelation = recommendationRelationQueryService.queryByRefereeId(event.getUserId());
+            if (Objects.nonNull(recommendationRelation)) {
                 BigDecimal pct = null;
-                Matchmaker matchmaker = matchmakerDao.selectById(marriageInformation.getMatchmakerId());
-                if (ProductSubCategoryEnum.MATCHMAKER_FRANCHISE_FEE.equals(matchmaker.getType())) {
-                    RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.MATCHMAKER_PARTNER_RECOMMEND_COST_PCT);
-                    pct = new BigDecimal(rewardConfig.getValue());
-                } else if (ProductSubCategoryEnum.MATCHMAKER_ONLINE_FEE.equals(matchmaker.getType())) {
-                    RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.MATCHMAKER_ONLINE_RECOMMEND_COST_PCT);
-                    pct = new BigDecimal(rewardConfig.getValue());
-                } else if (ProductSubCategoryEnum.MATCHMAKER_TRAINEE_FEE.equals(matchmaker.getType())) {
-                    RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.MATCHMAKER_TRAINEE_RECOMMEND_COST_PCT);
-                    pct = new BigDecimal(rewardConfig.getValue());
-                } else if (ProductSubCategoryEnum.MATCHMAKER_FREE_FEE.equals(matchmaker.getType())) {
-                    RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.MATCHMAKER_FREE_RECOMMEND_COST_PCT);
-                    pct = new BigDecimal(rewardConfig.getValue());
-                }
-                if (Objects.nonNull(pct)) {
-                    RewardConfig worthRewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.VIRTUAL_ACCOUNT_WORTH);
-                    //收益信息
-                    RevenueReward revenueReward = revenueRewardQueryService.queryByUserId(matchmaker.getUserId());
-                    if (Objects.isNull(revenueReward)) {
-                        revenueReward = RevenueReward.initUser(matchmaker.getUserId());
+                LiveMatchmaker liveMatchmaker = livematchmakerQueryService.queryByUserId(recommendationRelation.getReferrerId());
+                if (Objects.nonNull(liveMatchmaker)) {
+                    if (LiveMatchmakerTypeEnum.CONTRACT_MATCHMAKER.equals(liveMatchmaker.getType())) {
+                        RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.CONTRACT_MATCHMAKER_RECOMMEND_COST_PCT);
+                        pct = new BigDecimal(rewardConfig.getValue());
+                    } else if (LiveMatchmakerTypeEnum.ONLINE_MATCHMAKER.equals(liveMatchmaker.getType())) {
+                        RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.ONLINE_MATCHMAKER_RECOMMEND_COST_PCT);
+                        pct = new BigDecimal(rewardConfig.getValue());
+                    } else if (LiveMatchmakerTypeEnum.TRAINEE_MATCHMAKER.equals(liveMatchmaker.getType())) {
+                        RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.TRAINEE_MATCHMAKER_RECOMMEND_COST_PCT);
+                        pct = new BigDecimal(rewardConfig.getValue());
                     }
-                    //营收额
-                    BigDecimal revenue = new BigDecimal(worthRewardConfig.getValue()).multiply(BigDecimal.valueOf(event.getCostBalance()))
-                            .multiply(pct).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
+                    if (Objects.nonNull(pct)) {
+                        RewardConfig worthRewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.VIRTUAL_ACCOUNT_WORTH);
+                        //收益信息
+                        RevenueReward revenueReward = revenueRewardQueryService.queryByUserId(liveMatchmaker.getUserId());
+                        if (Objects.isNull(revenueReward)) {
+                            revenueReward = RevenueReward.initUser(liveMatchmaker.getUserId());
+                        }
+                        //营收额
+                        BigDecimal revenue = new BigDecimal(worthRewardConfig.getValue()).multiply(BigDecimal.valueOf(event.getCostBalance()))
+                                .multiply(pct).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
 
-                    RevenueRewardRecord revenueRewardRecord = RevenueRewardRecord.build(TradeTypeEnum.RECOMMEND_GIFT_REWARD, TradeSceneEnum.ONLINE,
-                            revenue, BigDecimal.valueOf(100), BigDecimal.ZERO, revenue, BigDecimal.valueOf(event.getCostBalance()));
-                    //todo
-                    revenueRewardRecord.setContent("邀请分成");
-                    RevenueRewardAssociateOrderRecord associateOrderRecord = RevenueRewardAssociateOrderRecord.build(event.getOrderId(), BigDecimal.valueOf(event.getCostBalance()));
-                    revenueRewardRecord.setAssociateOrderRecordList(Collections.singletonList(associateOrderRecord));
+                        RevenueRewardRecord revenueRewardRecord = RevenueRewardRecord.build(TradeTypeEnum.RECOMMEND_GIFT_REWARD, TradeSceneEnum.ONLINE,
+                                revenue, BigDecimal.valueOf(100), BigDecimal.ZERO, revenue, BigDecimal.valueOf(event.getCostBalance()));
+                        //todo
+                        revenueRewardRecord.setContent("邀请分成");
+                        RevenueRewardAssociateOrderRecord associateOrderRecord = RevenueRewardAssociateOrderRecord.build(event.getOrderId(), BigDecimal.valueOf(event.getCostBalance()));
+                        revenueRewardRecord.setAssociateOrderRecordList(Collections.singletonList(associateOrderRecord));
 
-                    revenueReward.setRecordList(Collections.singletonList(revenueRewardRecord));
-                    //钱包
-                    WalletAccount walletAccount = walletAccountQueryService.queryByType(matchmaker.getUserId(), IdentityTypeEnum.INDIVIDUAL);
-                    BigDecimal originalBalance = walletAccount.getTotalBalance();
-                    walletAccount.setAvailableBalance(walletAccount.getAvailableBalance().add(revenue));
-                    walletAccount.setTotalBalance(walletAccount.getAvailableBalance().add(walletAccount.getFrozenBalance()));
-                    WalletAccountRecord walletAccountRecord = WalletAccountRecord.build(TradeTypeEnum.RECOMMEND_GIFT_REWARD, revenue, true, originalBalance, walletAccount.getTotalBalance());
-                    walletAccount.setRecordList(Collections.singletonList(walletAccountRecord));
+                        revenueReward.setRecordList(Collections.singletonList(revenueRewardRecord));
+                        //钱包
+                        WalletAccount walletAccount = walletAccountQueryService.queryByType(liveMatchmaker.getUserId(), IdentityTypeEnum.INDIVIDUAL);
+                        BigDecimal originalBalance = walletAccount.getTotalBalance();
+                        walletAccount.setAvailableBalance(walletAccount.getAvailableBalance().add(revenue));
+                        walletAccount.setTotalBalance(walletAccount.getAvailableBalance().add(walletAccount.getFrozenBalance()));
+                        WalletAccountRecord walletAccountRecord = WalletAccountRecord.build(TradeTypeEnum.RECOMMEND_GIFT_REWARD, revenue, true, originalBalance, walletAccount.getTotalBalance());
+                        walletAccount.setRecordList(Collections.singletonList(walletAccountRecord));
 
-                    acquireRevenueRewardDomainService.handle(revenueReward, walletAccount);
+                        acquireRevenueRewardDomainService.handle(revenueReward, walletAccount);
+                    }
                 }
             }
         } catch (Exception e) {

dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/recommendationrelation/RecommendationRelationDao.java

@@ -0,0 +1,7 @@
+package com.qniao.dam.infrastructure.persistent.dao.recommendationrelation;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qniao.das.domian.aggregate.recommendationrelation.entity.RecommendationRelation;
+
+public interface RecommendationRelationDao extends BaseMapper<RecommendationRelation> {
+}

dating-agency-mall-server/src/main/java/com/qniao/dam/query/recommendationrelation/RecommendationRelationQueryService.java

@@ -0,0 +1,7 @@
+package com.qniao.dam.query.recommendationrelation;
+
+import com.qniao.das.domian.aggregate.recommendationrelation.entity.RecommendationRelation;
+
+public interface RecommendationRelationQueryService {
+    RecommendationRelation queryByRefereeId(Long refereeId);
+}

dating-agency-mall-server/src/main/java/com/qniao/dam/query/recommendationrelation/impl/RecommendationRelationQueryServiceImpl.java

@@ -0,0 +1,23 @@
+package com.qniao.dam.query.recommendationrelation.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qniao.dam.infrastructure.persistent.dao.recommendationrelation.RecommendationRelationDao;
+import com.qniao.dam.query.recommendationrelation.RecommendationRelationQueryService;
+import com.qniao.das.domian.aggregate.recommendationrelation.entity.RecommendationRelation;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class RecommendationRelationQueryServiceImpl implements RecommendationRelationQueryService {
+
+    @Resource
+    private RecommendationRelationDao recommendationRelationDao;
+
+    @Override
+    public RecommendationRelation queryByRefereeId(Long refereeId) {
+        return recommendationRelationDao.selectOne(new LambdaQueryWrapper<RecommendationRelation>()
+                .eq(RecommendationRelation::getRefereeId, refereeId)
+                .last("limit 1"));
+    }
+}

dating-agency-mall-server/src/main/java/com/qniao/dam/query/rewardconfig/impl/RewardConfigQueryServiceImpl.java

@@ -9,9 +9,12 @@ import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum;
 import com.qniao.dam.domian.aggregate.rewardconfig.constant.RewardTypeEnum;
 import com.qniao.dam.infrastructure.persistent.dao.domain.RewardConfigDao;
 import com.qniao.dam.infrastructure.persistent.dao.view.RewardConfigViewDao;
+import com.qniao.dam.query.livematchmaker.LiveMatchmakerQueryService;
 import com.qniao.dam.query.matchmaker.MatchmakerQueryService;
 import com.qniao.dam.query.rewardconfig.RewardConfigQueryService;
+import com.qniao.dau.domain.aggregate.livematchmaker.entity.LiveMatchmaker;
 import com.qniao.dau.domain.aggregate.matchmaker.entity.Matchmaker;
+import com.qniao.dau.domian.aggregate.lmar.constant.LiveMatchmakerTypeEnum;
 import com.qniao.dau.domian.aggregate.matchmaker.constant.MatchmakerLevelEnum;
 import com.qniao.framework.utils.TypeConvertUtils;
 import org.springframework.stereotype.Service;
@@ -32,6 +35,8 @@ public class RewardConfigQueryServiceImpl implements RewardConfigQueryService {
     private RewardConfigDao rewardConfigDao;
     @Resource
     private MatchmakerQueryService matchmakerQueryService;
+    @Resource
+    private LiveMatchmakerQueryService liveMatchmakerQueryService;
 
     @Override
     public UserGetRewardConfigDetailVo getRewardConfigDetail(UserGetRewardConfigDetailQueryParams queryParams) {
@@ -138,26 +143,23 @@ public class RewardConfigQueryServiceImpl implements RewardConfigQueryService {
     @Override
     public BigDecimal queryMatchmakerChannelGiftPct(Long userId, Integer todayCrossMicCount) {
         BigDecimal pct = BigDecimal.ZERO;
-        Matchmaker matchmaker = matchmakerQueryService.queryByUserId(userId);
-        if (ProductSubCategoryEnum.MATCHMAKER_FRANCHISE_FEE.equals(matchmaker.getType())) {
-            RewardConfig rewardConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_PARTNER_GIFT_PCT);
-            pct = new BigDecimal(rewardConfig.getValue());
-        } else if (ProductSubCategoryEnum.MATCHMAKER_ONLINE_FEE.equals(matchmaker.getType())) {
-            RewardConfig rewardConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_ONLINE_GIFT_PCT);
+        LiveMatchmaker liveMatchmaker = liveMatchmakerQueryService.queryByUserId(userId);
+        if (LiveMatchmakerTypeEnum.CONTRACT_MATCHMAKER.equals(liveMatchmaker.getType())) {
+            RewardConfig rewardConfig = queryByRewardType(RewardTypeEnum.CONTRACT_MATCHMAKER_GIFT_PCT);
             pct = new BigDecimal(rewardConfig.getValue());
-        } else if (ProductSubCategoryEnum.MATCHMAKER_TRAINEE_FEE.equals(matchmaker.getType())) {
-            RewardConfig minRewardConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_TRAINEE_GIFT_MIN_PCT);
+        } else if (LiveMatchmakerTypeEnum.ONLINE_MATCHMAKER.equals(liveMatchmaker.getType())) {
+            RewardConfig minRewardConfig = queryByRewardType(RewardTypeEnum.ONLINE_MATCHMAKER_GIFT_MIN_PCT);
             BigDecimal minPct = new BigDecimal(minRewardConfig.getValue());
-            RewardConfig maxRewardConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_TRAINEE_GIFT_MAX_PCT);
+            RewardConfig maxRewardConfig = queryByRewardType(RewardTypeEnum.ONLINE_MATCHMAKER_GIFT_MAX_PCT);
             BigDecimal maxPct = new BigDecimal(maxRewardConfig.getValue());
             RewardConfig ladderRewardConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_GIFT_LADDER_PCT);
             BigDecimal ladderPct = new BigDecimal(ladderRewardConfig.getValue());
             pct = minPct.add(ladderPct.multiply(BigDecimal.valueOf(todayCrossMicCount / 5)));
             pct = pct.compareTo(maxPct) > 0 ? maxPct : pct;
-        } else if (ProductSubCategoryEnum.MATCHMAKER_FREE_FEE.equals(matchmaker.getType())) {
-            RewardConfig minRewardConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_FREE_GIFT_MIN_PCT);
+        } else if (LiveMatchmakerTypeEnum.TRAINEE_MATCHMAKER.equals(liveMatchmaker.getType())) {
+            RewardConfig minRewardConfig = queryByRewardType(RewardTypeEnum.TRAINEE_MATCHMAKER_GIFT_MIN_PCT);
             BigDecimal minPct = new BigDecimal(minRewardConfig.getValue());
-            RewardConfig maxRewardConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_FREE_GIFT_MAX_PCT);
+            RewardConfig maxRewardConfig = queryByRewardType(RewardTypeEnum.TRAINEE_MATCHMAKER_GIFT_MAX_PCT);
             BigDecimal maxPct = new BigDecimal(maxRewardConfig.getValue());
             RewardConfig ladderRewardConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_GIFT_LADDER_PCT);
             BigDecimal ladderPct = new BigDecimal(ladderRewardConfig.getValue());