Merge remote-tracking branch 'origin/master'

miaoguoxin
2 parents 589fb3fa 4948df24
Showing 3 changed files with 23 additions and 6 deletions
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderQueryResponseDto.java
src/main/java/com/diligrp/xtrade/order/service/OrderService.java
src/main/java/com/diligrp/xtrade/order/service/impl/OrderServiceImpl.java
@@ -82,6 +82,9 @@ public class OrderQueryResponseDto {
 	//支付时间
 	private LocalDateTime payTime;
+	//创建时间
+	private LocalDateTime createdTime;
+	
 	//订单详情
 	private List<OrderItemDto> items = new ArrayList<OrderItemDto>();
@@ -280,5 +283,13 @@ public class OrderQueryResponseDto {
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
 	}
+
+	public LocalDateTime getCreatedTime() {
+		return createdTime;
+	}
+
+	public void setCreatedTime(LocalDateTime createdTime) {
+		this.createdTime = createdTime;
+	}
 }
 package com.diligrp.xtrade.order.service;
-import java.util.List;
-
 import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
 import com.diligrp.xtrade.order.domain.dto.OrderQueryRequestDto;
 import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
+import com.diligrp.xtrade.shared.domain.Page;
 /**
  * 
@@ -25,7 +24,7 @@ public interface OrderService {
 	 * @Title orderLists
 	 * @Description 获取订单列表
 	 */
-	List<OrderQueryResponseDto> orderLists(OrderQueryRequestDto orderQueryRequestDto);
+	Page<OrderQueryResponseDto> orderLists(OrderQueryRequestDto orderQueryRequestDto);
 	/**
 	 * @Title orderDetail
@@ -22,6 +22,7 @@ import com.diligrp.xtrade.order.domain.emuns.IdGenerator;
 import com.diligrp.xtrade.order.domain.entity.OrderDo;
 import com.diligrp.xtrade.order.rpc.feign.AccountResolver;
 import com.diligrp.xtrade.order.service.OrderService;
+import com.diligrp.xtrade.shared.domain.Page;
 import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
 @Service("orderService")
@@ -67,17 +68,23 @@ public class OrderServiceImpl implements OrderService {
 	// TODO need modify because of change
 	@Override
-	public List<OrderQueryResponseDto> orderLists(OrderQueryRequestDto orderQueryRequestDto) {
+	public Page<OrderQueryResponseDto> orderLists(OrderQueryRequestDto orderQueryRequestDto) {
+		Page<OrderQueryResponseDto> orderPage = new Page<OrderQueryResponseDto>();
+		List<OrderQueryResponseDto> roResponseDtos = new ArrayList<OrderQueryResponseDto>();
+		orderPage.setData(roResponseDtos);
 		OrderDo order = new OrderDo();
 		BeanUtils.copyProperties(orderQueryRequestDto, order);
+		int total = orderDao.selectEntryListCount(order);
+		if (total == 0) {
+			return orderPage;
+		}
 		List<OrderDo> orderDos = orderDao.selectEntryList(order);
-		List<OrderQueryResponseDto> roResponseDtos = new ArrayList<OrderQueryResponseDto>();
 		for (OrderDo orderDo : orderDos) {
 			OrderQueryResponseDto orderQueryResponseDto = new OrderQueryResponseDto();
 			BeanUtils.copyProperties(orderDo, orderQueryResponseDto);
 			roResponseDtos.add(orderQueryResponseDto);
 		}
-		return roResponseDtos;
+		return orderPage;
 	}
 	// TODO need modify because of change