自提时间

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

@@ -197,6 +197,11 @@ public class GicOrderController {
                 ret.getResult().getOrderNodeList()));
         detail.setPayTime(OrderDetailDTO.getNodeTimeStatic(OrderEnum.OrderNodeEnum.PAY_ORDER,
                 ret.getResult().getOrderNodeList()));
+        // 如果是自提
+        if (detail.getDeliveryChannel() == 2) {
+            detail.setPickUpTime(OrderDetailDTO.getNodeTimeStatic(OrderEnum.OrderNodeEnum.SUCCESSFUL,
+                    ret.getResult().getOrderNodeList()));
+        }
         // 自动收货时间
         List<OrderNodeDTO> stepList = ret.getResult().getOrderNodeList();
         if (CollectionUtils.isNotEmpty(stepList)) {

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

@@ -38,9 +38,10 @@ public class OrderDetailVO implements Serializable {
     private Integer orderType;
 
     /**
-     * 发货渠道类型(0自提，1快递)
+     * 发货渠道类型((2自提 , 1快递))
      */
-    private String deliveryChannel;
+    private Integer deliveryChannel;
+
 
     /**
      * 订单流程阶段 0交易关闭 1未付款（待付款、等待买家付款） 2已付款未发货（待发货、买家已付款） 3已发货未签收（待收货、已发货） 4已确认交易结束,5已发货订单项退款中,6待付款订单项退款中,7部分发货
@@ -77,28 +78,106 @@ public class OrderDetailVO implements Serializable {
      */
     private String amountPayableInfo;
 
+    // 自动收货时间
+    private Date autoTaskOverTime;
+
+    /**
+     * 收货人
+     */
+    private String buyerName;
+
+    /**
+     * 收货人联系方式
+     */
+    private String buyerPhone;
+
     /**
-     * 自提截止时间
+     * 自提门店ID
      */
-    private Date pickUpOverTime;
+    private String pickUpStoreId;
+
+    /**
+     * 自提门店code
+     */
+    private String pickUpStoreCode;
+
+    /**
+     * 自提门店名称
+     */
+    private String pickUpStoreName;
+
+    /**
+     * 自提收货地址
+     */
+    private String addressInfo;
     
-    // 自动收货时间
-    private Date autoTaskOverTime ;
+    /**
+     * 自提时间
+     */
+    private Date pickUpTime;
+    
+    public Date getPickUpTime() {
+        return pickUpTime;
+    }
 
-    public Date getAutoTaskOverTime() {
-        return autoTaskOverTime;
+    public void setPickUpTime(Date pickUpTime) {
+        this.pickUpTime = pickUpTime;
     }
 
-    public void setAutoTaskOverTime(Date autoTaskOverTime) {
-        this.autoTaskOverTime = autoTaskOverTime;
+    public String getBuyerName() {
+        return buyerName;
     }
 
-    public Date getPickUpOverTime() {
-        return pickUpOverTime;
+    public String getBuyerPhone() {
+        return buyerPhone;
     }
 
-    public void setPickUpOverTime(Date pickUpOverTime) {
-        this.pickUpOverTime = pickUpOverTime;
+    public String getPickUpStoreId() {
+        return pickUpStoreId;
+    }
+
+    public String getPickUpStoreCode() {
+        return pickUpStoreCode;
+    }
+
+    public String getPickUpStoreName() {
+        return pickUpStoreName;
+    }
+
+    public String getAddressInfo() {
+        return addressInfo;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
+    public void setBuyerPhone(String buyerPhone) {
+        this.buyerPhone = buyerPhone;
+    }
+
+    public void setPickUpStoreId(String pickUpStoreId) {
+        this.pickUpStoreId = pickUpStoreId;
+    }
+
+    public void setPickUpStoreCode(String pickUpStoreCode) {
+        this.pickUpStoreCode = pickUpStoreCode;
+    }
+
+    public void setPickUpStoreName(String pickUpStoreName) {
+        this.pickUpStoreName = pickUpStoreName;
+    }
+
+    public void setAddressInfo(String addressInfo) {
+        this.addressInfo = addressInfo;
+    }
+
+    public Date getAutoTaskOverTime() {
+        return autoTaskOverTime;
+    }
+
+    public void setAutoTaskOverTime(Date autoTaskOverTime) {
+        this.autoTaskOverTime = autoTaskOverTime;
     }
 
     public Date getPayTime() {
@@ -157,11 +236,11 @@ public class OrderDetailVO implements Serializable {
         this.orderType = orderType;
     }
 
-    public String getDeliveryChannel() {
+    public Integer getDeliveryChannel() {
         return deliveryChannel;
     }
 
-    public void setDeliveryChannel(String deliveryChannel) {
+    public void setDeliveryChannel(Integer deliveryChannel) {
         this.deliveryChannel = deliveryChannel;
     }