From 3ef3268cdacdb22d2bd60d1dc74e29b351fcea18 Mon Sep 17 00:00:00 2001 From: Derran Date: Wed, 2 Apr 2025 11:45:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E6=94=B6=E7=9B=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...erPageRevenueRewardRecordByOperatorVo.java | 9 +++++++ .../reward/RewardApplicationService.java | 25 +++++++++++-------- .../impl/RevenueRewardQueryServiceImpl.java | 4 ++- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageRevenueRewardRecordByOperatorVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageRevenueRewardRecordByOperatorVo.java index 463fafd..20d591c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageRevenueRewardRecordByOperatorVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageRevenueRewardRecordByOperatorVo.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; +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.dau.domian.aggregate.matchmaker.constant.MatchmakerLevelEnum; @@ -32,8 +33,16 @@ public class UserPageRevenueRewardRecordByOperatorVo { private String revenueOwnerPhone; @ApiModelProperty("红娘用户ID") + @JsonSerialize(using = ToStringSerializer.class) private Long matchmakerUserId; + @ApiModelProperty("组织唯一标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long orgId; + + @ApiModelProperty("身份类型（个人、组织）") + private IdentityTypeEnum identityType; + @ApiModelProperty("红娘身份类型") private ProductSubCategoryEnum matchmakerType; 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 9121a2e..148dcfc 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 @@ -17,10 +17,7 @@ import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; import com.qniao.dam.domian.aggregate.walletaccount.constant.IdentityTypeEnum; import com.qniao.dam.domian.aggregate.walletaccount.constant.TradeSceneEnum; import com.qniao.dam.infrastructure.constant.MqExchange; -import com.qniao.dam.infrastructure.persistent.dao.domain.MarriageInformationDao; -import com.qniao.dam.infrastructure.persistent.dao.domain.OperationCenterDao; -import com.qniao.dam.infrastructure.persistent.dao.domain.OrderDao; -import com.qniao.dam.infrastructure.persistent.dao.domain.StoreDao; +import com.qniao.dam.infrastructure.persistent.dao.domain.*; import com.qniao.dam.query.matchmaker.MatchmakerQueryService; import com.qniao.dam.query.operationcenter.OperationCenterQueryService; import com.qniao.dam.query.revenuereward.RevenueRewardQueryService; @@ -71,6 +68,8 @@ public class RewardApplicationService extends BaseApplicationService { private OperationCenterQueryService operationCenterQueryService; @Resource private AmqpTemplate amqpTemplate; + @Resource + private RevenueRewardDao revenueRewardDao; /** @@ -258,17 +257,17 @@ public class RewardApplicationService extends BaseApplicationService { if (Objects.nonNull(matchmaker.getStoreId())) { //门店收益 Store store = storeQueryService.queryById(matchmaker.getStoreId()); - handleAcquireReward(store.getOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_STORE_REWARD, serviceFee, meetingMi, + handleAcquireReward(store.getOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_STORE_REWARD, dto.getReceivedAmount(), meetingMi, dto.getTotalAssociateOrderAmount(), dto.getOrderIdRelList(), tradeType); //门店升级收益 if (Objects.nonNull(store.getParentStoreId())) { Store parentStore = storeQueryService.queryById(store.getParentStoreId()); - handleAcquireReward(parentStore.getOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_STORE_UPGRADE_REWARD, serviceFee, meetingMi, + handleAcquireReward(parentStore.getOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_STORE_UPGRADE_REWARD, dto.getReceivedAmount(), meetingMi, dto.getTotalAssociateOrderAmount(), dto.getOrderIdRelList(), tradeType); } //运营中心 if (Objects.nonNull(store.getOperationCenterOrgId())) { - handleAcquireReward(store.getOperationCenterOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_OPERATION_CENTER_REWARD, serviceFee, meetingMi, + handleAcquireReward(store.getOperationCenterOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_OPERATION_CENTER_REWARD, dto.getReceivedAmount(), meetingMi, dto.getTotalAssociateOrderAmount(), dto.getOrderIdRelList(), tradeType); } } @@ -366,17 +365,17 @@ public class RewardApplicationService extends BaseApplicationService { if (Objects.nonNull(matchmaker.getStoreId())) { //门店收益 Store store = storeQueryService.queryById(matchmaker.getStoreId()); - handleAcquireReward(store.getOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_STORE_REWARD, serviceFee, associatedMi, + handleAcquireReward(store.getOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_STORE_REWARD, dto.getReceivedAmount(), associatedMi, dto.getTotalAssociateOrderAmount(), dto.getOrderIdRelList(), tradeType); //门店升级收益 if (Objects.nonNull(store.getParentStoreId())) { Store parentStore = storeQueryService.queryById(store.getParentStoreId()); - handleAcquireReward(parentStore.getOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_STORE_UPGRADE_REWARD, serviceFee, associatedMi, + handleAcquireReward(parentStore.getOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_STORE_UPGRADE_REWARD, dto.getReceivedAmount(), associatedMi, dto.getTotalAssociateOrderAmount(), dto.getOrderIdRelList(), tradeType); } //运营中心 if (Objects.nonNull(store.getOperationCenterOrgId())) { - handleAcquireReward(store.getOperationCenterOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_OPERATION_CENTER_REWARD, serviceFee, associatedMi, + handleAcquireReward(store.getOperationCenterOrgId(), IdentityTypeEnum.ORGANIZATION, RewardTypeEnum.PLATFORM_SERVICE_OPERATION_CENTER_REWARD, dto.getReceivedAmount(), associatedMi, dto.getTotalAssociateOrderAmount(), dto.getOrderIdRelList(), tradeType); } } @@ -414,8 +413,12 @@ public class RewardApplicationService extends BaseApplicationService { public void replenishMatchmakerJoinRecommend() { List revenueRewardRecordList = revenueRewardQueryService. listAllRecordBy(TradeTypeEnum.MATCHMAKER_JOIN_RECOMMEND_FEE, TradeSceneEnum.ONLINE); - if (CollUtil.isNotEmpty(revenueRewardRecordList)){ + if (CollUtil.isNotEmpty(revenueRewardRecordList)) { + revenueRewardRecordList.forEach(record -> { + RevenueReward revenueReward = revenueRewardDao.selectById(record.getRevenueRewardId()); + //判断是否个人收入 + }); } } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java index 1a29f16..9ac6326 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java @@ -103,7 +103,9 @@ public class RevenueRewardQueryServiceImpl implements RevenueRewardQueryService Map> allAssociateOrderRecordMap = allAssociateOrderRecordList.stream().collect(Collectors.groupingBy(RevenueRewardAssociateOrderRecordVo::getRevenueRewardRecordId)); page.getRecords().forEach(record -> { record.setAssociateOrderRecordList(allAssociateOrderRecordMap.get(record.getRevenueRewardRecordId())); - record.setMatchmakerLevel(matchmakerQueryService.queryLevelByUserId(record.getMatchmakerUserId())); + if (Objects.nonNull(record.getMatchmakerUserId())) { + record.setMatchmakerLevel(matchmakerQueryService.queryLevelByUserId(record.getMatchmakerUserId())); + } }); } return page;