From 5202d152c17c343bcfb0ec8510c168f0f7461684 Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 18 Nov 2024 17:29:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E5=A8=98=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/UserAcquireMatchmakerJoinRecommendRewardDto.java | 2 +- .../request/UserAcquireMatchmakerJoinRecommendRewardDto.java | 4 ++-- .../application/service/reward/RewardApplicationService.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 5c477a4..3083586 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 @@ -14,7 +14,7 @@ public class UserAcquireMatchmakerJoinRecommendRewardDto { private Long receiveUserId; private Long storeOrgId; private Long operationCenterOrgId; - private ProductSubCategoryEnum type; + private Long associateOrderId; private MatchmakerLevelEnum initiatorLevel; private MatchmakerLevelEnum receiveLevel; } 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 ea87560..2c64fa8 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 @@ -22,8 +22,8 @@ public class UserAcquireMatchmakerJoinRecommendRewardDto { @ApiModelProperty("运营中心组织id") private Long operationCenterOrgId; - @ApiModelProperty("红娘类型") - private ProductSubCategoryEnum type; + @ApiModelProperty("关联订单") + private Long associateOrderId; @ApiModelProperty("发起红娘级别") private MatchmakerLevelEnum initiatorLevel; 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 df80afe..b8eef52 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(), dto.getType()); + Order associateOrder = orderDao.selectById(dto.getAssociateOrderId()); if (Objects.nonNull(associateOrder)) { BigDecimal rewardAmount = associateOrder.getSettlementAmount(); //推荐的红娘