From d30fd268b50c8007ddb7759e6d7b031d55e51fb8 Mon Sep 17 00:00:00 2001
From: sin <2943460818@qq.com>
Date: Mon, 29 Apr 2019 19:54:35 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=B5=81=20last?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/bo/OrderLastLogisticsInfoBO.java      |  85 +++++++++++++++
 .../api/bo/OrderLogisticsInfoWithOrderBO.java | 100 ++++++++++++++++++
 2 files changed, 185 insertions(+)
 create mode 100644 order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLastLogisticsInfoBO.java
 create mode 100644 order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsInfoWithOrderBO.java

diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLastLogisticsInfoBO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLastLogisticsInfoBO.java
new file mode 100644
index 000000000..48da3e5be
--- /dev/null
+++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLastLogisticsInfoBO.java
@@ -0,0 +1,85 @@
+package cn.iocoder.mall.order.api.bo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 订单物流 - 最后一个物流信息
+ *
+ * @author Sin
+ * @time 2019-04-12 22:03
+ */
+@Data
+@Accessors(chain = true)
+public class OrderLastLogisticsInfoBO implements Serializable {
+
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 收件区域编号
+     */
+    private String areaNo;
+    /**
+     * 收件人名称
+     */
+    private String name;
+    /**
+     * 收件手机号
+     */
+    private String mobile;
+    /**
+     * 收件详细地址
+     */
+    private String address;
+    /**
+     * 物流 (字典)
+     */
+    private Integer logistics;
+    /**
+     * 物流 (字典) 转换后的值
+     */
+    private String logisticsText;
+    /**
+     * 物流编号
+     */
+    private String logisticsNo;
+
+    ///
+    /// 物流信息
+
+    /**
+     * 最后一个物流信息
+     */
+    private LogisticsDetail lastLogisticsDetail;
+
+    @Data
+    @Accessors(chain = true)
+    public static class LogisticsDetail {
+        /**
+         * id
+         */
+        private Integer id;
+        /**
+         * 物流id
+         */
+        private Integer orderLogisticsId;
+        /**
+         * 物流时间
+         */
+        private Date logisticsTime;
+        /**
+         * 物流时间 text
+         */
+        private String logisticsTimeText;
+        /**
+         * 物流信息
+         */
+        private String logisticsInformation;
+    }
+}
diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsInfoWithOrderBO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsInfoWithOrderBO.java
new file mode 100644
index 000000000..c10c23341
--- /dev/null
+++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsInfoWithOrderBO.java
@@ -0,0 +1,100 @@
+package cn.iocoder.mall.order.api.bo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 订单物流 - 详细信息
+ *
+ * @author Sin
+ * @time 2019-04-12 22:03
+ */
+@Data
+@Accessors(chain = true)
+public class OrderLogisticsInfoWithOrderBO implements Serializable {
+
+    /**
+     * 订单id
+     */
+    private Integer orderId;
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+    /**
+     * 物流信息
+     */
+    private List<Logistics> logistics;
+
+    @Data
+    @Accessors(chain = true)
+    public static class Logistics {
+
+        /**
+         * id
+         */
+        private Integer id;
+        /**
+         * 收件区域编号
+         */
+        private String areaNo;
+        /**
+         * 收件人名称
+         */
+        private String name;
+        /**
+         * 收件手机号
+         */
+        private String mobile;
+        /**
+         * 收件详细地址
+         */
+        private String address;
+        /**
+         * 物流 (字典)
+         */
+        private Integer logistics;
+        /**
+         * 物流 (字典) 转换后的值
+         */
+        private String logisticsText;
+        /**
+         * 物流编号
+         */
+        private String logisticsNo;
+
+        ///
+        /// 物流信息
+
+        private List<LogisticsDetail> details;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class LogisticsDetail {
+        /**
+         * id
+         */
+        private Integer id;
+        /**
+         * 物流id
+         */
+        private Integer orderLogisticsId;
+        /**
+         * 物流时间
+         */
+        private Date logisticsTime;
+        /**
+         * 物流时间 text
+         */
+        private String logisticsTimeText;
+        /**
+         * 物流信息
+         */
+        private String logisticsInformation;
+    }
+}