- 添加确认订单

- 添加查看物流

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

@@ -0,0 +1,26 @@
+package cn.iocoder.mall.order.api;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.order.api.bo.OrderLogisticsBO;
+import cn.iocoder.mall.order.api.bo.OrderLogisticsInfoBO;
+
+import java.util.List;
+
+/**
+ * 订单物流信息
+ *
+ * @author Sin
+ * @time 2019-04-12 21:29
+ */
+public interface OrderLogisticsService {
+
+    /**
+     * 物流信息
+     *
+     * @param userId
+     * @param orderId
+     * @return
+     */
+    CommonResult<OrderLogisticsInfoBO> logisticsInfo(Integer userId, Integer orderId);
+
+}

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

@@ -97,6 +97,15 @@ public interface OrderService {
      */
     CommonResult deleteOrderItem(OrderItemDeletedDTO orderItemDeletedDTO);
 
+    /**
+     * 用户确认订单
+     *
+     * @param userId
+     * @param orderId
+     * @return
+     */
+    CommonResult confirmReceiving(Integer userId, Integer orderId);
+
     /**
      * 更新订单 - 收件这信息
      *

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

@@ -0,0 +1,96 @@
+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 OrderLogisticsInfoBO 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 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;
+    }
+}

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

@@ -22,6 +22,8 @@ public enum OrderErrorCodeEnum {
     ORDER_GET_GOODS_INFO_INCORRECT(1008000008, "获取额商品信息不正确!"),
     ORDER_GET_USER_ADDRESS_FAIL(1008000009, "获取用户地址失败!"),
     ORDER_GET_PAY_FAIL(1008000010, "调用pay失败!"),
+    ORDER_NOT_USER_ORDER(1008000011, "不是该用户的订单!"),
+    ORDER_UNABLE_CONFIRM_ORDER(1008000012, "状态不对不能确认订单!"),
 
     // order item
     ORDER_ITEM_ONLY_ONE(1008000200, "订单Item只有一个!"),