diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/eso/constant/EntrustServiceStatusEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/eso/constant/EntrustServiceStatusEnum.java index 3ec5bf4..11e4437 100644 --- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/eso/constant/EntrustServiceStatusEnum.java +++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/eso/constant/EntrustServiceStatusEnum.java @@ -14,7 +14,7 @@ public enum EntrustServiceStatusEnum { PENDING_ACCEPT(1, "待接单"), - COMPLETED_SETTLEMENT(2, "已结单"), + ACCEPTED(2, "已接单"), FINISHED(3, "已完成"), diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/order/constant/OrderTypeEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/order/constant/OrderTypeEnum.java index b9a9052..4737285 100644 --- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/order/constant/OrderTypeEnum.java +++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/order/constant/OrderTypeEnum.java @@ -14,7 +14,9 @@ public enum OrderTypeEnum { MARRIAGE_BOUNTY(2, "悬赏招亲"), - VIRTUAL_TYPE(3, "虚拟类型"); + VIRTUAL_TYPE(3, "虚拟类型"), + + ENTRUST_SERVICE(4, "委托服务"); @EnumValue @JsonValue diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitEntrustServiceOrderDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitEntrustServiceOrderDto.java index 2ff9f74..f52ac29 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitEntrustServiceOrderDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitEntrustServiceOrderDto.java @@ -3,6 +3,7 @@ package com.qniao.dam.api.command.order.user.request; import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder; import com.qniao.dam.domain.aggregate.order.entity.Order; import com.qniao.dam.domian.aggregate.eso.constant.EntrustServiceTypeEnum; +import com.qniao.dam.domian.aggregate.order.constant.OrderTypeEnum; import com.qniao.domain.Trans2DomainAssembler; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,7 +23,9 @@ public class UserSubmitEntrustServiceOrderDto implements Trans2DomainAssembler() + .eq(EntrustServiceOrder::getInitiatorUserId, entrustServiceOrder.getInitiatorUserId()) + .eq(EntrustServiceOrder::getTargetMiId, entrustServiceOrder.getTargetMiId()) + .in(EntrustServiceOrder::getStatus, Arrays.asList(EntrustServiceStatusEnum.PENDING_ACCEPT, EntrustServiceStatusEnum.ACCEPTED))) > 0) { + throw new RuntimeException("已委托过服务"); + } + } } \ No newline at end of file