From e68c8193e3a9928934412f9310697f5d108f2222 Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 7 Oct 2024 09:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E8=B5=8F=E6=8B=9B=E4=BA=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregate/product/constant/ProductSubCategoryEnum.java | 5 ++++- .../request/UserAcquireMatchmakerJoinRecommendRewardDto.java | 2 ++ .../request/UserAcquireMatchmakerJoinRecommendRewardDto.java | 4 ++++ .../application/service/reward/RewardApplicationService.java | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java index 5d1005e..e63ee3d 100644 --- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java +++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java @@ -42,7 +42,10 @@ public enum ProductSubCategoryEnum { MARRIAGE_BOUNTY_WOMAN_FEE(1002, "线下活动女性费用"), - MATCHMAKER_FRANCHISE_FEE(88801, "红娘合伙人加盟费"); + MATCHMAKER_FRANCHISE_FEE(88801, "红娘合伙人加盟费"), + + MATCHMAKER_ONLINE_FEE(88802, "线上红娘加盟费"); + @EnumValue @JsonValue diff --git a/dating-agency-mall-sdk/src/main/java/com/qniao/dam/application/request/UserAcquireMatchmakerJoinRecommendRewardDto.java b/dating-agency-mall-sdk/src/main/java/com/qniao/dam/application/request/UserAcquireMatchmakerJoinRecommendRewardDto.java index 165dee8..a103e78 100644 --- a/dating-agency-mall-sdk/src/main/java/com/qniao/dam/application/request/UserAcquireMatchmakerJoinRecommendRewardDto.java +++ b/dating-agency-mall-sdk/src/main/java/com/qniao/dam/application/request/UserAcquireMatchmakerJoinRecommendRewardDto.java @@ -1,5 +1,6 @@ package com.qniao.dam.application.request; +import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,4 +13,5 @@ public class UserAcquireMatchmakerJoinRecommendRewardDto { private Long receiveUserId; private Long storeOrgId; private Long operationCenterOrgId; + private ProductSubCategoryEnum type; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/request/UserAcquireMatchmakerJoinRecommendRewardDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/request/UserAcquireMatchmakerJoinRecommendRewardDto.java index cde4fab..1c4909e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/request/UserAcquireMatchmakerJoinRecommendRewardDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/request/UserAcquireMatchmakerJoinRecommendRewardDto.java @@ -1,5 +1,6 @@ package com.qniao.dam.api.command.reward.user.request; +import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,4 +21,7 @@ public class UserAcquireMatchmakerJoinRecommendRewardDto { @ApiModelProperty("运营中心组织id") private Long operationCenterOrgId; + @ApiModelProperty("红娘类型") + private ProductSubCategoryEnum type; + } 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 0a6431d..e2856b2 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 @@ -65,7 +65,7 @@ public class RewardApplicationService { */ public void acquireMatchmakerJoinRecommendReward(UserAcquireMatchmakerJoinRecommendRewardDto dto) { //红娘加盟订单 - Order associateOrder = orderQueryService.queryBySubCategory(dto.getReceiveUserId(), ProductSubCategoryEnum.MATCHMAKER_FRANCHISE_FEE); + Order associateOrder = orderQueryService.queryBySubCategory(dto.getReceiveUserId(), dto.getType()); BigDecimal rewardAmount = associateOrder.getSettlementAmount(); //推荐的红娘 if (Objects.nonNull(dto.getInitiatorUserId())) {