From 7eae6045a9098a7240bd3ce3bceff7288a3b50b3 Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 10 Mar 2026 17:00:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=9C=8D=E5=8A=A1=E8=B4=B9?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dam/domain/aggregate/eso/entity/EntrustServiceOrder.java | 4 ++++ .../service/eso/EntrustServiceOrderApplicationService.java | 2 ++ .../application/service/order/OrderApplicationService.java | 1 + 3 files changed, 7 insertions(+) diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/eso/entity/EntrustServiceOrder.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/eso/entity/EntrustServiceOrder.java index 9f5900b..9ecc095 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/eso/entity/EntrustServiceOrder.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/eso/entity/EntrustServiceOrder.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import com.qniao.domain.Entity; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * 委托服务订单 @@ -57,6 +58,9 @@ public class EntrustServiceOrder extends Entity { @ApiModelProperty("付款状态") private EntrustServicePaymentStatusEnum paymentStatus; + @ApiModelProperty("接收时间") + private LocalDateTime acceptedTime; + @ApiModelProperty("备注") private String remark; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/eso/EntrustServiceOrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/eso/EntrustServiceOrderApplicationService.java index d869508..feee9d3 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/eso/EntrustServiceOrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/eso/EntrustServiceOrderApplicationService.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; import java.util.Objects; @Service @@ -68,6 +69,7 @@ public class EntrustServiceOrderApplicationService extends BaseApplicationServic if (isAccept) { //红娘接单 entrustServiceOrder.setStatus(EntrustServiceStatusEnum.ACCEPTED); + entrustServiceOrder.setAcceptedTime(LocalDateTime.now()); entrustServiceOrderAggregate.edit(entrustServiceOrder); } else { //红娘拒接单 diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java index 1eb8bfb..d34aedf 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java @@ -331,6 +331,7 @@ public class OrderApplicationService extends BaseApplicationService { ProductSpec productSpec = product.getProductSpecList().get(0); OrderItem orderItem = getOrderItem(product, productSpec); order.setOrderItemList(Collections.singletonList(orderItem)); + order.calculate(); } private OrderItem getOrderItem(Product product, ProductSpec productSpec) {