订单列表

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.http.util.EntityUtils;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,6 +17,7 @@ import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.business.order.dto.ordermanage.ListOrderDTO;
+import com.gic.business.order.dto.ordermanage.ListOrderItemDTO;
 import com.gic.business.order.dto.ordermanage.OrderDetailDTO;
 import com.gic.business.order.enums.ActivityPreferentialTypeEnum;
 import com.gic.business.order.enums.OrderEnum;
@@ -58,7 +60,18 @@ public class GicOrderController {
         ServiceResponse<Page<ListOrderDTO>> ret = webOrderManageApiService.listOrder(qdto);
         logger.info("订单信息={}", JSON.toJSONString(ret, true));
         if (ret.isSuccess()) {
+            Page<ListOrderDTO> page = ret.getResult();
+            List<ListOrderDTO> orderList = page.getResult();
+            List<OrderListVO> voList = new ArrayList<>();
+            for (ListOrderDTO order : orderList) {
+                OrderListVO vo = EntityUtil.changeEntityNew(OrderListVO.class, order);
+                List<ListOrderItemDTO> itemList = order.getOrderItemDTOList();
+                List<OrderListItemVO> voItemList = EntityUtil.changeEntityListNew(OrderListItemVO.class, itemList);
+                vo.setOrderItemList(voItemList);
+                voList.add(vo);
+            }
             Page<OrderListVO> retPage = PageHelperUtils.changePageToCurrentPage(ret.getResult(), OrderListVO.class);
+            retPage.setResult(voList);
             return RestResponse.successResult(retPage);
         }
         return RestResponse.failure(ret.getCode(), ret.getMessage());

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderListVO.java

@@ -26,7 +26,7 @@ public class OrderListVO implements Serializable {
     /**
      * 下单时间
      */
-    private Date orderTime;
+    private Date createTime;
 
     /**
      * 订单来源 0:会员自行购买 1导购推荐订单 （原字段为 订单类型：0:微商城 1:导购推荐订单）
@@ -49,11 +49,6 @@ public class OrderListVO implements Serializable {
     private String memberCardNum;
 
     /**
-     * 发货渠道类型(0自提，1快递)
-     */
-    private String deliveryChannel;
-
-    /**
      * 订单流程阶段 0交易关闭 1未付款（待付款、等待买家付款） 2已付款未发货（待发货、买家已付款） 3已发货未签收（待收货、已发货） 4已确认交易结束,5已发货订单项退款中,6待付款订单项退款中,7部分发货
      */
     private String orderStep;
@@ -88,13 +83,13 @@ public class OrderListVO implements Serializable {
     public void setOrderNumber(String orderNumber) {
         this.orderNumber = orderNumber;
     }
-
-    public Date getOrderTime() {
-        return orderTime;
+    
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public void setOrderTime(Date orderTime) {
-        this.orderTime = orderTime;
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     public Integer getOrderType() {
@@ -129,14 +124,6 @@ public class OrderListVO implements Serializable {
         this.memberCardNum = memberCardNum;
     }
 
-    public String getDeliveryChannel() {
-        return deliveryChannel;
-    }
-
-    public void setDeliveryChannel(String deliveryChannel) {
-        this.deliveryChannel = deliveryChannel;
-    }
-
     public String getOrderStep() {
         return orderStep;
     }