diff --git a/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/matchmaker/event/MatchmakerFranchiseFeeRewardEvent.java b/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/matchmaker/event/MatchmakerFranchiseFeeRewardEvent.java index 34306d9..0d50fb7 100644 --- a/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/matchmaker/event/MatchmakerFranchiseFeeRewardEvent.java +++ b/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/matchmaker/event/MatchmakerFranchiseFeeRewardEvent.java @@ -30,4 +30,7 @@ public class MatchmakerFranchiseFeeRewardEvent extends BaseDomainEvent { @ApiModelProperty("关联ID") private Long associateId; + + @ApiModelProperty("最大收益") + private BigDecimal maxReward; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/rpa/RafflePrizeActivityEventHandler.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/rpa/RafflePrizeActivityEventHandler.java index 26ba4ce..0856b96 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/rpa/RafflePrizeActivityEventHandler.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/rpa/RafflePrizeActivityEventHandler.java @@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.Objects; @Component @@ -46,7 +47,9 @@ public class RafflePrizeActivityEventHandler extends BaseApplicationService { winning.setName(matchmaker.getName()); winning.setPhone(matchmaker.getPhone()); winning.setIsDraw(false); - winning.setMaxReward(event.getStayFranchiseFee().stripTrailingZeros().toPlainString()); + winning.setMaxReward(event.getStayFranchiseFee().compareTo(event.getMaxReward()) <= 0 ? + event.getStayFranchiseFee().stripTrailingZeros().toPlainString() : + event.getMaxReward().stripTrailingZeros().toPlainString()); winning.setRemark(event.getInitiatorLevel().getDesc() + matchmaker.getName() + "邀请" + event.getReceiveLevel().getDesc() + event.getReceiveUserName() + "加盟,加盟费" + event.getFranchiseFee().stripTrailingZeros().toPlainString()); rafflePrizeActivityWinningAggregate.create(winning); 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 f7b8c3e..de29b80 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 @@ -116,6 +116,7 @@ public class RewardApplicationService extends BaseApplicationService { rewardEvent.setInitiatorLevel(dto.getInitiatorLevel()); rewardEvent.setReceiveLevel(dto.getReceiveLevel()); rewardEvent.setAssociateId(dto.getAssociateOrderId()); + rewardEvent.setMaxReward(revenue); this.sendEvent(rewardEvent); }