自提截止时间

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

@@ -498,6 +498,9 @@ public class GicOrderController {
     public OrderDetailVO getOrderDetail(String enterpriseId, OrderInfoDTO orderInfo,
             List<ListOrderItemDTO> orderItemDTOList, String storeId) {
         OrderDetailVO orderDetailVO = EntityUtil.changeEntityByJSON(OrderDetailVO.class, orderInfo);
+        if(null != orderInfo.getPickUpDetail()) {
+            orderDetailVO.setPickUpReserveTime(orderInfo.getPickUpDetail().getGoodsTime());
+        }
         orderDetailVO.setUsePoint(orderInfo.getUsePoints());
         orderDetailVO.setBuyerRemark(orderInfo.getRemarks());
         List<OrderDetailItemVO> orderItemList = EntityUtil.changeEntityListNew(OrderDetailItemVO.class,

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

@@ -133,6 +133,11 @@ public class OrderDetailVO implements Serializable {
      * 自提截止时间
      */
     private Date pickUpOverTime ;
+
+    /**
+     * 自提预约时间
+     */
+    private String pickUpReserveTime ;
     
     // 核销码
     private String writeOffCode ;
@@ -145,6 +150,14 @@ public class OrderDetailVO implements Serializable {
     // 物流包裹列表
     private List<String> orderLogisticsIdList ;
 
+    public String getPickUpReserveTime() {
+        return pickUpReserveTime;
+    }
+
+    public void setPickUpReserveTime(String pickUpReserveTime) {
+        this.pickUpReserveTime = pickUpReserveTime;
+    }
+
     public Date getPickUpOverTime() {
         return pickUpOverTime;
     }