diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/entity/MarriageBountyOrder.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/entity/MarriageBountyOrder.java index 7174f4c..1a59150 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/entity/MarriageBountyOrder.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/entity/MarriageBountyOrder.java @@ -1,11 +1,13 @@ package com.qniao.dam.domain.aggregate.marriagebounty.entity; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.annotation.TableName; import com.qniao.dam.domain.aggregate.marriagebounty.valueobj.MarriageBountyOrderProductRecord; import com.qniao.dam.domain.aggregate.marriagebounty.valueobj.MarriageBountyOrderRel; import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderPaymentStatusEnum; import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderStatusEnum; import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderType; +import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; import com.qniao.domain.Entity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -64,4 +66,16 @@ public class MarriageBountyOrder extends Entity { .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); } } + + public int getMeetingQuantity() { + int meetingQuantity = 0; + if (CollUtil.isNotEmpty(orderRewardList)) { + for (MarriageBountyOrderReward orderReward : orderRewardList) { + if (ProductSubCategoryEnum.MARRIAGE_BOUNTY_MEETING_FEE.equals(orderReward.getRewardCategory())) { + meetingQuantity++; + } + } + } + return meetingQuantity; + } } diff --git a/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/marriagebounty/event/MarriageBountyOrderCreatedEvent.java b/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/marriagebounty/event/MarriageBountyOrderCreatedEvent.java index ef26116..2479a4e 100644 --- a/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/marriagebounty/event/MarriageBountyOrderCreatedEvent.java +++ b/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/marriagebounty/event/MarriageBountyOrderCreatedEvent.java @@ -1,6 +1,8 @@ package com.qniao.dam.domian.aggregate.marriagebounty.event; +import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderType; import com.qniao.domain.BaseDomainEvent; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,4 +20,8 @@ public class MarriageBountyOrderCreatedEvent extends BaseDomainEvent { private Long miId; + private MarriageBountyOrderType type; + + private Integer meetingQuantity; + } diff --git a/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/marriagebounty/event/MarriageBountyOrderCreatedMQ.java b/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/marriagebounty/event/MarriageBountyOrderCreatedMQ.java index 00c53a0..0b891c1 100644 --- a/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/marriagebounty/event/MarriageBountyOrderCreatedMQ.java +++ b/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/marriagebounty/event/MarriageBountyOrderCreatedMQ.java @@ -1,5 +1,6 @@ package com.qniao.dam.domian.aggregate.marriagebounty.event; +import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderType; import lombok.Data; import java.io.Serializable; @@ -14,4 +15,7 @@ public class MarriageBountyOrderCreatedMQ implements Serializable { private Long miId; + private MarriageBountyOrderType type; + + private Integer meetingQuantity; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java index 35e0e8e..1832166 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java @@ -35,7 +35,7 @@ public class UserSubmitMarriageBountyOrderDto implements Trans2DomainAssemblerhttp://120.78.76.88:8081/repository/maven-releases/ - maven-snapshot + maven-snapshots Nexus snapshot Repository http://120.78.76.88:8081/repository/maven-snapshots/