- 添加订单收件人信息

- 分离订单物流信息

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/OrderService.java

@@ -56,6 +56,14 @@ public interface OrderService {
      */
     CommonResult cancelOrder(Integer orderId, Integer reasons, String otherReasons);
 
+    /**
+     * 订单发货
+     *
+     * @param orderDelivery
+     * @return
+     */
+    CommonResult orderDelivery(OrderDeliveryDTO orderDelivery);
+
     /**
      * 更新订单 - 备注
      *

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderBO.java

@@ -90,7 +90,7 @@ public class OrderBO implements Serializable {
     /**
      * 订单物流信息
      */
-    private OrderLogisticsBO orderLogistics;
+    private OrderRecipientBO orderRecipient;
 
     @Override
     public String toString() {
@@ -108,7 +108,7 @@ public class OrderBO implements Serializable {
                 ", status=" + status +
                 ", remark='" + remark + '\'' +
                 ", orderItems=" + orderItems +
-                ", orderLogistics=" + orderLogistics +
+                ", orderRecipient=" + orderRecipient +
                 '}';
     }
 
@@ -229,12 +229,12 @@ public class OrderBO implements Serializable {
         return this;
     }
 
-    public OrderLogisticsBO getOrderLogistics() {
-        return orderLogistics;
+    public OrderRecipientBO getOrderRecipient() {
+        return orderRecipient;
     }
 
-    public OrderBO setOrderLogistics(OrderLogisticsBO orderLogistics) {
-        this.orderLogistics = orderLogistics;
+    public OrderBO setOrderRecipient(OrderRecipientBO orderRecipient) {
+        this.orderRecipient = orderRecipient;
         return this;
     }
 }

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderRecipientBO.java

@@ -0,0 +1,103 @@
+package cn.iocoder.mall.order.api.bo;
+
+import cn.iocoder.common.framework.dataobject.BaseDO;
+
+/**
+ * 订单收件人信息 order_recipient
+ *
+ * @author Sin
+ * @time 2019-03-31 11:37
+ */
+public class OrderRecipientBO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    private Integer id;
+    /**
+     * 订单id
+     */
+    private Integer orderId;
+    /**
+     * 收件区域编号
+     */
+    private String areaNo;
+    /**
+     * 收件人名称
+     */
+    private String name;
+    /**
+     * 收件手机号
+     */
+    private String mobile;
+    /**
+     * 收件详细地址
+     */
+    private String address;
+
+    @Override
+    public String toString() {
+        return "OrderRecipientBO{" +
+                "id=" + id +
+                ", orderId=" + orderId +
+                ", areaNo='" + areaNo + '\'' +
+                ", name='" + name + '\'' +
+                ", mobile='" + mobile + '\'' +
+                ", address='" + address + '\'' +
+                '}';
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public OrderRecipientBO setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public OrderRecipientBO setOrderId(Integer orderId) {
+        this.orderId = orderId;
+        return this;
+    }
+
+    public String getAreaNo() {
+        return areaNo;
+    }
+
+    public OrderRecipientBO setAreaNo(String areaNo) {
+        this.areaNo = areaNo;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public OrderRecipientBO setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public OrderRecipientBO setMobile(String mobile) {
+        this.mobile = mobile;
+        return this;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public OrderRecipientBO setAddress(String address) {
+        this.address = address;
+        return this;
+    }
+}

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/constant/LogisticsEnum.java

@@ -0,0 +1,41 @@
+package cn.iocoder.mall.order.api.constant;
+
+/**
+ * 物流信息
+ *
+ * @author Sin
+ * @time 2019-03-30 22:33
+ */
+public enum LogisticsEnum {
+
+    LOGISTICS_1(1, "顺丰快递"),
+    LOGISTICS_2(2, "圆通快递"),
+    LOGISTICS_3(3, "申通快递"),
+    LOGISTICS_4(4, "韵答快递"),
+    LOGISTICS_5(5, "天天快递"),
+    LOGISTICS_6(6, "EMS中国邮政"),
+
+    ;
+
+    /**
+     * 状态值
+     */
+    private Integer value;
+    /**
+     * 状态名
+     */
+    private String name;
+
+    LogisticsEnum(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderDeliveryDTO.java

@@ -0,0 +1,122 @@
+package cn.iocoder.mall.order.api.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 订单发货
+ *
+ * @author Sin
+ * @time 2019-03-30 22:31
+ */
+public class OrderDeliveryDTO implements Serializable {
+
+    /**
+     * 收件区域编号
+     */
+    private String areaNo;
+    /**
+     * 收件人名称
+     */
+    private String name;
+    /**
+     * 收件手机号
+     */
+    private String mobile;
+    /**
+     * 收件详细地址
+     */
+    private String address;
+    /**
+     * 物流 (字典)
+     */
+    private Integer logistics;
+    /**
+     * 物流编号
+     */
+    private String logisticsNo;
+
+    ///
+    /// 物理信息是跟 orderItem 走
+
+    /**
+     * 订单 orderItemId
+     */
+    private List<Integer> orderItemIds;
+
+    @Override
+    public String toString() {
+        return "OrderDeliverGoodsDTO{" +
+                "areaNo='" + areaNo + '\'' +
+                ", name='" + name + '\'' +
+                ", mobile='" + mobile + '\'' +
+                ", address='" + address + '\'' +
+                ", logistics=" + logistics +
+                ", logisticsNo='" + logisticsNo + '\'' +
+                ", orderItemIds=" + orderItemIds +
+                '}';
+    }
+
+    public String getAreaNo() {
+        return areaNo;
+    }
+
+    public OrderDeliveryDTO setAreaNo(String areaNo) {
+        this.areaNo = areaNo;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public OrderDeliveryDTO setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public OrderDeliveryDTO setMobile(String mobile) {
+        this.mobile = mobile;
+        return this;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public OrderDeliveryDTO setAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+    public Integer getLogistics() {
+        return logistics;
+    }
+
+    public OrderDeliveryDTO setLogistics(Integer logistics) {
+        this.logistics = logistics;
+        return this;
+    }
+
+    public String getLogisticsNo() {
+        return logisticsNo;
+    }
+
+    public OrderDeliveryDTO setLogisticsNo(String logisticsNo) {
+        this.logisticsNo = logisticsNo;
+        return this;
+    }
+
+    public List<Integer> getOrderItemIds() {
+        return orderItemIds;
+    }
+
+    public OrderDeliveryDTO setOrderItemIds(List<Integer> orderItemIds) {
+        this.orderItemIds = orderItemIds;
+        return this;
+    }
+}