From db693186d4367f42db01ea7168f147a4fe7cff34 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Fri, 6 Mar 2026 19:29:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/EntrustServiceStatusEnum.java    |  2 +-
 .../order/constant/OrderTypeEnum.java         |  4 +++-
 .../UserSubmitEntrustServiceOrderDto.java     |  5 ++++-
 .../order/OrderApplicationService.java        | 14 ++++++++++++++
 .../eso/EntrustServiceOrderQueryService.java  |  3 +++
 .../EntrustServiceOrderQueryServiceImpl.java  | 19 +++++++++++++++++++
 6 files changed, 44 insertions(+), 3 deletions(-)

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<O
 
     @Override
     public Order trans2Domain() {
-        return new Order();
+        Order order = new Order();
+        order.setOrderType(OrderTypeEnum.ENTRUST_SERVICE);
+        return order;
     }
 
 
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 db38842..b7b878f 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
@@ -41,6 +41,7 @@ import com.qniao.dam.infrastructure.persistent.dao.domain.MarriageInformationDao
 import com.qniao.dam.infrastructure.persistent.dao.domain.OrderDao;
 import com.qniao.dam.infrastructure.persistent.dao.domain.SiteActivityDao;
 import com.qniao.dam.infrastructure.utils.SnowFlakeUtil;
+import com.qniao.dam.query.eso.EntrustServiceOrderQueryService;
 import com.qniao.dam.query.marriagebounty.MarriageBountyOrderQueryService;
 import com.qniao.dam.query.matchmaker.MatchmakerQueryService;
 import com.qniao.dam.query.matchmakermarriage.MatchmakerMarriageInformationQueryService;
@@ -125,6 +126,8 @@ public class OrderApplicationService extends BaseApplicationService {
     private UserMarriageInformationQueryService userMarriageInformationQueryService;
     @Resource
     private UserManagementQueryService userManagementQueryService;
+    @Resource
+    private EntrustServiceOrderQueryService entrustServiceOrderQueryService;
 
 
     @Value("${default_marriage_bounty_matchmaker_id}")
@@ -286,6 +289,17 @@ public class OrderApplicationService extends BaseApplicationService {
 
     public UserSubmitOrderVo submitEntrustServiceOrder(Order order,
                                                        EntrustServiceOrder entrustServiceOrder) {
+        //1.查询是否存在委托服务
+        entrustServiceOrderQueryService.checkEntrustServiceOrder(entrustServiceOrder);
+        //2.查询委托服务价格
+        BigDecimal amount = queryEntrustServiceAmount(entrustServiceOrder);
+        return null;
+    }
+
+    /**
+     * 查询委托服务价格
+     */
+    private BigDecimal queryEntrustServiceAmount(EntrustServiceOrder entrustServiceOrder) {
 
     }
 
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java
index 498647f..a017c1c 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java
@@ -1,5 +1,8 @@
 package com.qniao.dam.query.eso;
 
+import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder;
+
 public interface EntrustServiceOrderQueryService {
 
+    void checkEntrustServiceOrder(EntrustServiceOrder entrustServiceOrder);
 }
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java
index a8a9703..886d572 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java
@@ -1,9 +1,28 @@
 package com.qniao.dam.query.eso.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder;
+import com.qniao.dam.domian.aggregate.eso.constant.EntrustServiceStatusEnum;
+import com.qniao.dam.infrastructure.persistent.dao.eso.EntrustServiceOrderDao;
 import com.qniao.dam.query.eso.EntrustServiceOrderQueryService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Arrays;
+
 @Service
 public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQueryService {
 
+    @Resource
+    private EntrustServiceOrderDao entrustServiceOrderDao;
+
+    @Override
+    public void checkEntrustServiceOrder(EntrustServiceOrder entrustServiceOrder) {
+        if (entrustServiceOrderDao.selectCount(new LambdaQueryWrapper<EntrustServiceOrder>()
+                .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