委托服务

dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/OrderUserCommandController.java

@@ -5,6 +5,7 @@ import com.qniao.dam.api.command.order.user.response.UserCalculateMatchmakerOrde
 import com.qniao.dam.api.command.order.user.response.UserCalculateOrderFeeVo;
 import com.qniao.dam.api.command.order.user.response.UserSubmitOrderVo;
 import com.qniao.dam.application.service.order.OrderApplicationService;
+import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder;
 import com.qniao.dam.domain.aggregate.marriagebounty.entity.MarriageBountyOrder;
 import com.qniao.dam.domain.aggregate.order.entity.Order;
 import com.qniao.dam.domain.aggregate.product.entity.Product;
@@ -60,9 +61,13 @@ public class OrderUserCommandController {
 
     @ApiOperation("用户提交委托服务订单")
     @PostMapping("submit/entrust-service-order")
-    public UserSubmitOrderVo userSubmitEntrustServiceOrder(@RequestBody @Valid UserSubmitEntrustServiceOrderDto dto) {
-
-        return null;
+    public UserSubmitOrderVo userSubmitEntrustServiceOrder(@RequestBody @Valid UserSubmitEntrustServiceOrderDto dto,
+                                                           @RequestParam("userId") Long userId) {
+        Order order = dto.trans2Domain();
+        order.setUserId(userId);
+        EntrustServiceOrder entrustServiceOrder = dto.trans2EntrustServiceOrder();
+        entrustServiceOrder.setInitiatorUserId(userId);
+        return orderApplicationService.submitEntrustServiceOrder(order, entrustServiceOrder);
     }
 
     @ApiOperation("用户计算线下活动订单费用")

dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitEntrustServiceOrderDto.java

@@ -1,22 +1,35 @@
 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.domain.Trans2DomainAssembler;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 public class UserSubmitEntrustServiceOrderDto implements Trans2DomainAssembler<Order> {
 
     @ApiModelProperty("委托服务类型")
+    @NotNull(message = "委托服务类型不能为空")
     private EntrustServiceTypeEnum type;
 
+    @ApiModelProperty("目标资料标识")
+    @NotNull(message = "目标资料标识不能为空")
+    private Long targetMiId;
 
     @Override
     public Order trans2Domain() {
-        Order order = new Order();
-        return order;
+        return new Order();
     }
 
+
+    public EntrustServiceOrder trans2EntrustServiceOrder() {
+        EntrustServiceOrder entrustServiceOrder = new EntrustServiceOrder();
+        entrustServiceOrder.setType(type);
+        entrustServiceOrder.setTargetMiId(targetMiId);
+        return entrustServiceOrder;
+    }
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java

@@ -10,6 +10,7 @@ import com.qniao.dam.api.command.order.user.response.UserCalculateOrderFeeVo;
 import com.qniao.dam.api.command.order.user.response.UserSubmitOrderVo;
 import com.qniao.dam.application.service.product.ProductApplicationService;
 import com.qniao.dam.domain.aggregate.activity.entity.ActivityProduct;
+import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder;
 import com.qniao.dam.domain.aggregate.marriagebounty.MarriageBountyOrderAggregate;
 import com.qniao.dam.domain.aggregate.marriagebounty.entity.MarriageBountyOrder;
 import com.qniao.dam.domain.aggregate.marriagebounty.entity.MarriageBountyOrderReward;
@@ -283,6 +284,11 @@ public class OrderApplicationService extends BaseApplicationService {
         return new UserSubmitOrderVo(order.getId(), paymentOrder.getId(), false);
     }
 
+    public UserSubmitOrderVo submitEntrustServiceOrder(Order order,
+                                                       EntrustServiceOrder entrustServiceOrder) {
+
+    }
+
     /**
      * 计算招亲榜的订单金额
      *
@@ -642,4 +648,5 @@ public class OrderApplicationService extends BaseApplicationService {
         submitOrderDomainService.handle(order, paymentOrder);
         return new UserSubmitOrderVo(order.getId(), paymentOrder.getId(), false);
     }
+
 }