详情调整

zhangxing
1 parent eee70062
Showing 3 changed files with 18 additions and 7 deletions
src/main/java/com/diligrp/xtrade/order/domain/builder/DefaultOrderCreator.java
src/main/java/com/diligrp/xtrade/order/domain/builder/OrderDataBuilder.java
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderQueryResponseDto.java
@@ -33,10 +33,7 @@ public class DefaultOrderCreator {
 	private OrderCreateRequestDto orderCreateDto;
-	public DefaultOrderCreator() {
-	}
-
-	public DefaultOrderCreator(AccountDto saccountDto, OrderCreateRequestDto orderCreateDto) {
+	private DefaultOrderCreator(AccountDto saccountDto, OrderCreateRequestDto orderCreateDto) {
 		this.saccountDto = saccountDto;
 		this.orderCreateDto = orderCreateDto;
 	}
@@ -2,6 +2,9 @@ package com.diligrp.xtrade.order.domain.builder;
 import java.util.List;
+import org.springframework.beans.BeanUtils;
+
+import com.diligrp.xtrade.order.domain.dto.OrderItemDto;
 import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
 import com.diligrp.xtrade.order.domain.entity.OrderDo;
 import com.diligrp.xtrade.order.domain.entity.OrderItemDo;
@@ -19,8 +22,14 @@ public class OrderDataBuilder {
 	 * 构建基本的订单详情数据 TODO need modify because of change
 	 */
 	public static OrderQueryResponseDto buildOrderDetail(OrderDo order, List<OrderItemDo> orderItem) {
-		OrderQueryResponseDto orderQueryResponseDto = new OrderQueryResponseDto();
-		return orderQueryResponseDto;
+		OrderQueryResponseDto orderResponseDto = new OrderQueryResponseDto();
+		BeanUtils.copyProperties(order, orderResponseDto);
+		for (OrderItemDo orderItemDo : orderItem) {
+			OrderItemDto orderItemDto = new OrderItemDto();
+			BeanUtils.copyProperties(orderItemDo, orderItemDto);
+			orderResponseDto.addItems(orderItemDto);
+		}
+		return orderResponseDto;
 	}
 }
 package com.diligrp.xtrade.order.domain.dto;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 /**
@@ -82,7 +83,11 @@ public class OrderQueryResponseDto {
 	private LocalDateTime payTime;
 	//订单详情
-	private List<OrderItemDto> items;
+	private List<OrderItemDto> items = new ArrayList<OrderItemDto>();
+	
+	public void addItems(OrderItemDto item) {
+		items.add(item);
+	}
 	public Long getOrderId() {
 		return orderId;