Browse Source

红娘订单

master
张彭杰 1 year ago
parent
commit
7e1d5b4c8c
3 changed files with 5 additions and 1 deletions
  1. 1
      dating-agency-mall-sdk/src/main/java/com/qniao/dam/application/request/UserAcquireMatchmakerJoinRecommendRewardDto.java
  2. 3
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/request/UserAcquireMatchmakerJoinRecommendRewardDto.java
  3. 2
      dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/reward/RewardApplicationService.java

1
dating-agency-mall-sdk/src/main/java/com/qniao/dam/application/request/UserAcquireMatchmakerJoinRecommendRewardDto.java

@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
public class UserAcquireMatchmakerJoinRecommendRewardDto { public class UserAcquireMatchmakerJoinRecommendRewardDto {
private Long initiatorUserId; private Long initiatorUserId;
private Long receiveUserId; private Long receiveUserId;
private String receiveUserName;
private Long associateOrderId; private Long associateOrderId;
private MatchmakerLevelEnum initiatorLevel; private MatchmakerLevelEnum initiatorLevel;
private MatchmakerLevelEnum receiveLevel; private MatchmakerLevelEnum receiveLevel;

3
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("接收用户") @ApiModelProperty("接收用户")
private Long receiveUserId; private Long receiveUserId;
@ApiModelProperty("接收用户名称")
private String receiveUserName;
@ApiModelProperty("关联订单") @ApiModelProperty("关联订单")
private Long associateOrderId; private Long associateOrderId;

2
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); rewardAmount = rewardAmount.subtract(revenue);
RevenueRewardRecord revenueRewardRecord = RevenueRewardRecord.build(TradeTypeEnum.MATCHMAKER_JOIN_RECOMMEND_FEE, RevenueRewardRecord revenueRewardRecord = RevenueRewardRecord.build(TradeTypeEnum.MATCHMAKER_JOIN_RECOMMEND_FEE,
revenue, revenue, associateOrder.getSettlementAmount()); 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()); RevenueRewardAssociateOrderRecord associateOrderRecord = RevenueRewardAssociateOrderRecord.build(associateOrder.getId(), associateOrder.getSettlementAmount());
revenueRewardRecord.setAssociateOrderRecordList(Collections.singletonList(associateOrderRecord)); revenueRewardRecord.setAssociateOrderRecordList(Collections.singletonList(associateOrderRecord));
revenueReward.setRecordList(Collections.singletonList(revenueRewardRecord)); revenueReward.setRecordList(Collections.singletonList(revenueRewardRecord));

Loading…
Cancel
Save