From 1f37fc367a00aaf31947a841519f13f76f0acfbf Mon Sep 17 00:00:00 2001 From: Derran Date: Thu, 29 Jan 2026 17:35:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=BA=A2=E5=A8=98=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rewardconfig/constant/RewardTypeEnum.java | 19 ++-- .../VirtualAccountEventHandler.java | 88 ++++++++++--------- .../RecommendationRelationDao.java | 7 ++ .../RecommendationRelationQueryService.java | 7 ++ ...ecommendationRelationQueryServiceImpl.java | 23 +++++ .../impl/RewardConfigQueryServiceImpl.java | 26 +++--- ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 ...=> RecommendationRelationQueryService.xml} | 0 29 files changed, 107 insertions(+), 63 deletions(-) create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/recommendationrelation/RecommendationRelationDao.java create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/query/recommendationrelation/RecommendationRelationQueryService.java create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/query/recommendationrelation/impl/RecommendationRelationQueryServiceImpl.java rename dating-agency-mall-server/src/main/resources/mapper/activity/{WalletAccountAssociateOrderRecordDao.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/bankcard/{BankCardMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/contract/{ContractMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/externalorder/{ExternalOrderRelMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/odc/{OrderDiscountConfigMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/ora/{OrderRefundApplicationMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/order/{WalletAccountAssociateOrderRecordDao.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/par/{PointAccountRecordMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/paymentorder/{PaymentOrderDao.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/pointaccount/{PointAccountMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/prc/{PointRewardConfigMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/product/{WalletAccountAssociateOrderRecordDao.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/puc/{PointUpgradeConfigMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/revenuereward/{RevenueRewardViewMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/rewardconfig/{WalletAccountAssociateOrderRecordDao.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/right/{WalletAccountAssociateOrderRecordDao.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/rpa/{RafflePrizeActivityMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/rpaw/{RafflePrizeActivityWinningMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/rpc/{RafflePrizeConfigMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/utc/{UserTaskCompleteDao.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/virtualaccount/{VirtualAccountRecordDao.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/walletaccount/{WalletAccountViewMapper.xml => RecommendationRelationQueryService.xml} (100%) rename dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/{WithdrawAuditViewMapper.xml => RecommendationRelationQueryService.xml} (100%) diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardTypeEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardTypeEnum.java index 11fa32b..86415d7 100644 --- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardTypeEnum.java +++ b/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 diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/virtualaccount/VirtualAccountEventHandler.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/virtualaccount/VirtualAccountEventHandler.java index 55622e5..e22e10e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/virtualaccount/VirtualAccountEventHandler.java +++ b/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) { diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/recommendationrelation/RecommendationRelationDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/recommendationrelation/RecommendationRelationDao.java new file mode 100644 index 0000000..f36a171 --- /dev/null +++ b/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 { +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/recommendationrelation/RecommendationRelationQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/recommendationrelation/RecommendationRelationQueryService.java new file mode 100644 index 0000000..7dd1810 --- /dev/null +++ b/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); +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/recommendationrelation/impl/RecommendationRelationQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/recommendationrelation/impl/RecommendationRelationQueryServiceImpl.java new file mode 100644 index 0000000..5abeaf9 --- /dev/null +++ b/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() + .eq(RecommendationRelation::getRefereeId, refereeId) + .last("limit 1")); + } +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rewardconfig/impl/RewardConfigQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rewardconfig/impl/RewardConfigQueryServiceImpl.java index 467c87b..7bde8ef 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rewardconfig/impl/RewardConfigQueryServiceImpl.java +++ b/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()); diff --git a/dating-agency-mall-server/src/main/resources/mapper/activity/WalletAccountAssociateOrderRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/activity/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/activity/WalletAccountAssociateOrderRecordDao.xml rename to dating-agency-mall-server/src/main/resources/mapper/activity/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/bankcard/BankCardMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/bankcard/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/bankcard/BankCardMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/bankcard/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/contract/ContractMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/contract/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/contract/ContractMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/contract/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/externalorder/ExternalOrderRelMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/externalorder/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/externalorder/ExternalOrderRelMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/externalorder/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/odc/OrderDiscountConfigMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/odc/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/odc/OrderDiscountConfigMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/odc/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/ora/OrderRefundApplicationMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/ora/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/ora/OrderRefundApplicationMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/ora/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/order/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml rename to dating-agency-mall-server/src/main/resources/mapper/order/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/par/PointAccountRecordMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/par/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/par/PointAccountRecordMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/par/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/paymentorder/PaymentOrderDao.xml b/dating-agency-mall-server/src/main/resources/mapper/paymentorder/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/paymentorder/PaymentOrderDao.xml rename to dating-agency-mall-server/src/main/resources/mapper/paymentorder/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/pointaccount/PointAccountMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/pointaccount/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/pointaccount/PointAccountMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/pointaccount/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/prc/PointRewardConfigMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/prc/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/prc/PointRewardConfigMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/prc/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/product/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml rename to dating-agency-mall-server/src/main/resources/mapper/product/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/puc/PointUpgradeConfigMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/puc/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/puc/PointUpgradeConfigMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/puc/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/revenuereward/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/rewardconfig/WalletAccountAssociateOrderRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/rewardconfig/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/rewardconfig/WalletAccountAssociateOrderRecordDao.xml rename to dating-agency-mall-server/src/main/resources/mapper/rewardconfig/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/right/WalletAccountAssociateOrderRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/right/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/right/WalletAccountAssociateOrderRecordDao.xml rename to dating-agency-mall-server/src/main/resources/mapper/right/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/rpa/RafflePrizeActivityMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/rpa/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/rpa/RafflePrizeActivityMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/rpa/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/rpaw/RafflePrizeActivityWinningMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/rpaw/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/rpaw/RafflePrizeActivityWinningMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/rpaw/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/rpc/RafflePrizeConfigMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/rpc/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/rpc/RafflePrizeConfigMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/rpc/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/utc/UserTaskCompleteDao.xml b/dating-agency-mall-server/src/main/resources/mapper/utc/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/utc/UserTaskCompleteDao.xml rename to dating-agency-mall-server/src/main/resources/mapper/utc/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/virtualaccount/VirtualAccountRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/virtualaccount/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/virtualaccount/VirtualAccountRecordDao.xml rename to dating-agency-mall-server/src/main/resources/mapper/virtualaccount/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/walletaccount/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/walletaccount/RecommendationRelationQueryService.xml diff --git a/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/WithdrawAuditViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/RecommendationRelationQueryService.xml similarity index 100% rename from dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/WithdrawAuditViewMapper.xml rename to dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/RecommendationRelationQueryService.xml