Browse Source

订单退款申请

master
张彭杰 1 year ago
parent
commit
9ec11bd4b8
6 changed files with 28 additions and 2 deletions
  1. 14
      dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/entity/MarriageBountyOrder.java
  2. 6
      dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/marriagebounty/event/MarriageBountyOrderCreatedEvent.java
  3. 4
      dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/marriagebounty/event/MarriageBountyOrderCreatedMQ.java
  4. 2
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java
  5. 2
      dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/MarriageBountyOrderAggregate.java
  6. 2
      pom.xml

14
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; package com.qniao.dam.domain.aggregate.marriagebounty.entity;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.qniao.dam.domain.aggregate.marriagebounty.valueobj.MarriageBountyOrderProductRecord; import com.qniao.dam.domain.aggregate.marriagebounty.valueobj.MarriageBountyOrderProductRecord;
import com.qniao.dam.domain.aggregate.marriagebounty.valueobj.MarriageBountyOrderRel; 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.MarriageBountyOrderPaymentStatusEnum;
import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderStatusEnum; import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderStatusEnum;
import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderType; import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderType;
import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum;
import com.qniao.domain.Entity; import com.qniao.domain.Entity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -64,4 +66,16 @@ public class MarriageBountyOrder extends Entity<MarriageBountyOrder> {
.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); .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;
}
} }

6
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; package com.qniao.dam.domian.aggregate.marriagebounty.event;
import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderType;
import com.qniao.domain.BaseDomainEvent; import com.qniao.domain.BaseDomainEvent;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -18,4 +20,8 @@ public class MarriageBountyOrderCreatedEvent extends BaseDomainEvent {
private Long miId; private Long miId;
private MarriageBountyOrderType type;
private Integer meetingQuantity;
} }

4
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; package com.qniao.dam.domian.aggregate.marriagebounty.event;
import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderType;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -14,4 +15,7 @@ public class MarriageBountyOrderCreatedMQ implements Serializable {
private Long miId; private Long miId;
private MarriageBountyOrderType type;
private Integer meetingQuantity;
} }

2
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 Trans2DomainAssembler<O
@ApiModelProperty("见面费用") @ApiModelProperty("见面费用")
@NotNull(message = "见面费用不能为空") @NotNull(message = "见面费用不能为空")
@DecimalMin(value = "1", message = "见面费用不等低于1元")
@DecimalMin(value = "0.01", message = "见面费用不等低于0.01元")
private BigDecimal meetingFee; private BigDecimal meetingFee;
@ApiModelProperty("可见面费用次数") @ApiModelProperty("可见面费用次数")

2
dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/MarriageBountyOrderAggregate.java

@ -34,6 +34,8 @@ public class MarriageBountyOrderAggregate {
marriageBountyOrder.setStatus(MarriageBountyOrderStatusEnum.MATCHMAKING); marriageBountyOrder.setStatus(MarriageBountyOrderStatusEnum.MATCHMAKING);
marriageBountyOrder.setPaymentStatus(MarriageBountyOrderPaymentStatusEnum.PAID); marriageBountyOrder.setPaymentStatus(MarriageBountyOrderPaymentStatusEnum.PAID);
marriageBountyOrderRepository.save(marriageBountyOrder); marriageBountyOrderRepository.save(marriageBountyOrder);
MarriageBountyOrderCreatedEvent event = TypeConvertUtils.convert(marriageBountyOrder, MarriageBountyOrderCreatedEvent.class);
event.setMeetingQuantity(marriageBountyOrder.getMeetingQuantity());
return TypeConvertUtils.convert(marriageBountyOrder, MarriageBountyOrderCreatedEvent.class); return TypeConvertUtils.convert(marriageBountyOrder, MarriageBountyOrderCreatedEvent.class);
} }

2
pom.xml

@ -34,7 +34,7 @@
<url>http://120.78.76.88:8081/repository/maven-releases/</url> <url>http://120.78.76.88:8081/repository/maven-releases/</url>
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<id>maven-snapshot</id>
<id>maven-snapshots</id>
<name>Nexus snapshot Repository</name> <name>Nexus snapshot Repository</name>
<url>http://120.78.76.88:8081/repository/maven-snapshots/</url> <url>http://120.78.76.88:8081/repository/maven-snapshots/</url>
</snapshotRepository> </snapshotRepository>

Loading…
Cancel
Save