diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/UserGetMarriageBountyOrderProductInfoVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/UserGetMarriageBountyOrderProductInfoVo.java index 3a20ddf..bce59ac 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/UserGetMarriageBountyOrderProductInfoVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/UserGetMarriageBountyOrderProductInfoVo.java @@ -2,6 +2,7 @@ package com.qniao.dam.api.query.marriagebounty.user.response; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderType; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,9 +15,15 @@ public class UserGetMarriageBountyOrderProductInfoVo { @JsonSerialize(using = ToStringSerializer.class) private Long marriageBountyOrderId; + @ApiModelProperty("悬赏招亲类型") + private MarriageBountyOrderType type; + @ApiModelProperty("见面费用") private BigDecimal meetingFee = BigDecimal.ZERO; + @ApiModelProperty("见面次数") + private Integer meetingQuantity; + @ApiModelProperty("已用见面次数") private Integer usedMeetingQuantity = 0; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java index 1f70f86..c59d0b0 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java @@ -103,7 +103,9 @@ public class MarriageBountyOrderQueryServiceImpl implements MarriageBountyOrderQ if (Objects.nonNull(marriageBountyOrder)) { productInfoVo = new UserGetMarriageBountyOrderProductInfoVo(); productInfoVo.setMarriageBountyOrderId(marriageBountyOrder.getId()); + productInfoVo.setType(marriageBountyOrder.getType()); productInfoVo.setRewardAmount(marriageBountyOrder.getRewardAmount()); + productInfoVo.setMeetingQuantity(marriageBountyOrder.getMeetingQuantity()); int usedMeetingQuantity = 0; int usableMeetingQuantity = 0; for (MarriageBountyOrderReward orderReward : marriageBountyOrder.getOrderRewardList()) {