From 7e1d5b4c8c9dc95e01577fb2bb86be5082f2585a Mon Sep 17 00:00:00 2001 From: Derran Date: Fri, 22 Nov 2024 15:33:26 +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 | 1 + .../request/UserAcquireMatchmakerJoinRecommendRewardDto.java | 3 +++ .../application/service/reward/RewardApplicationService.java | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) 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 122f13c..f20aca8 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 @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; public class UserAcquireMatchmakerJoinRecommendRewardDto { private Long initiatorUserId; private Long receiveUserId; + private String receiveUserName; 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 cfaf4c0..4de0c78 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 @@ -13,6 +13,9 @@ public class UserAcquireMatchmakerJoinRecommendRewardDto { @ApiModelProperty("接收用户") private Long receiveUserId; + @ApiModelProperty("接收用户名称") + private String receiveUserName; + @ApiModelProperty("关联订单") private Long associateOrderId; 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 55da7be..7c31660 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 @@ -84,7 +84,7 @@ public class RewardApplicationService { rewardAmount = rewardAmount.subtract(revenue); RevenueRewardRecord revenueRewardRecord = RevenueRewardRecord.build(TradeTypeEnum.MATCHMAKER_JOIN_RECOMMEND_FEE, revenue, revenue, associateOrder.getSettlementAmount()); - revenueRewardRecord.handleContent(Collections.singletonList(StrUtil.isNotBlank(associateOrder.getOrderBelongName()) ? associateOrder.getOrderBelongName() : "")); + revenueRewardRecord.handleContent(Collections.singletonList(StrUtil.isNotBlank(dto.getReceiveUserName()) ? dto.getReceiveUserName() : "")); RevenueRewardAssociateOrderRecord associateOrderRecord = RevenueRewardAssociateOrderRecord.build(associateOrder.getId(), associateOrder.getSettlementAmount()); revenueRewardRecord.setAssociateOrderRecordList(Collections.singletonList(associateOrderRecord)); revenueReward.setRecordList(Collections.singletonList(revenueRewardRecord));