- 添加 userId 绑定订单

- 添加后台订单分页
2019-03-23 14:53:08 +08:00
parent aae124d888
commit 13c89a34b2
13 changed files with 646 additions and 76 deletions
--- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/OrderService.java
+++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/OrderService.java
@@ -2,10 +2,9 @@ package cn.iocoder.mall.order.api;

 import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.order.api.bo.OrderBO;
-import cn.iocoder.mall.order.api.dto.OrderCreateDTO;
-import cn.iocoder.mall.order.api.dto.OrderItemDeletedDTO;
-import cn.iocoder.mall.order.api.dto.OrderLogisticsDTO;
-import cn.iocoder.mall.order.api.dto.OrderItemUpdateDTO;
+import cn.iocoder.mall.order.api.dto.*;
+
+import java.util.List;

 /**
 * 订单 service
@@ -15,13 +14,22 @@ import cn.iocoder.mall.order.api.dto.OrderItemUpdateDTO;
 */
 public interface OrderService {

+    /**
+     * 订单 page
+     *
+     * @param orderQueryDTO
+     * @return
+     */
+    CommonResult<List<OrderPageBO>> getOrderPage(OrderQueryDTO orderQueryDTO);
+
    /**
     * 订单 - 创建
     *
+     * @param userId
     * @param orderCreateDTO
     * @return
     */
-    CommonResult<OrderBO> createOrder(OrderCreateDTO orderCreateDTO);
+    CommonResult<OrderBO> createOrder(Integer userId, OrderCreateDTO orderCreateDTO);

    /**
     * 订单item - 更新
--- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateDTO.java
+++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateDTO.java
@@ -13,6 +13,10 @@ import java.util.List;
 */
 public class OrderCreateDTO implements Serializable {

+    /**
+     * 用户id
+     */
+    private Integer userId;
    /**
     * 收件区域编号
     */
@@ -48,7 +52,8 @@ public class OrderCreateDTO implements Serializable {
    @Override
    public String toString() {
        return "OrderCreateDTO{" +
-                "areaNo='" + areaNo + '\'' +
+                "userId=" + userId +
+                ", areaNo='" + areaNo + '\'' +
                ", name='" + name + '\'' +
                ", mobile='" + mobile + '\'' +
                ", address='" + address + '\'' +
@@ -57,6 +62,15 @@ public class OrderCreateDTO implements Serializable {
                '}';
    }

+    public Integer getUserId() {
+        return userId;
+    }
+
+    public OrderCreateDTO setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
    public String getAreaNo() {
        return areaNo;
    }
--- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderPageBO.java
+++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderPageBO.java
@@ -0,0 +1,248 @@
+package cn.iocoder.mall.order.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 订单 page
+ *
+ * @author Sin
+ * @time 2019-03-23 14:30
+ */
+public class OrderPageBO implements Serializable {
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 用户编号
+     */
+    private Integer userId;
+    /**
+     * 物流id
+     */
+    private Integer orderLogisticsId;
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+    /**
+     * 交易金额
+     */
+    private Integer money;
+
+    ///
+    /// 时间信息
+
+    /**
+     * 付款时间（待发货）
+     */
+    private Date paymentTime;
+    /**
+     * 发货时间（待收货）
+     */
+    private Date deliveryTime;
+    /**
+     * 收货时间（已签收）
+     */
+    private Date receiverTime;
+    /**
+     * 成交时间（用户确认收货 -> status = 已完成）
+     */
+    private Date closingTime;
+
+    ///
+    /// 其他
+
+    /**
+     * 是否退货
+     *
+     * - 0、没有
+     * - 1、换货
+     * - 2、退货
+     * - 3、换货 + 退货
+     */
+    private Integer hasReturnExchange;
+    /**
+     * 状态(如果有多个商品分开发货需要全部商品发完才会改变状态)
+     *
+     * - 0、待付款
+     * - 1、待发货
+     * - 2、待收获
+     * - 3、已完成
+     * - 4、已关闭
+     */
+    private Integer status;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 删除
+     */
+    private Integer deleted;
+
+    @Override
+    public String toString() {
+        return "OrderPageBO{" +
+                "id=" + id +
+                ", userId=" + userId +
+                ", orderLogisticsId=" + orderLogisticsId +
+                ", orderNo='" + orderNo + '\'' +
+                ", money=" + money +
+                ", paymentTime=" + paymentTime +
+                ", deliveryTime=" + deliveryTime +
+                ", receiverTime=" + receiverTime +
+                ", closingTime=" + closingTime +
+                ", hasReturnExchange=" + hasReturnExchange +
+                ", status=" + status +
+                ", remark='" + remark + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", deleted=" + deleted +
+                '}';
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public OrderPageBO setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public OrderPageBO setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public Integer getOrderLogisticsId() {
+        return orderLogisticsId;
+    }
+
+    public OrderPageBO setOrderLogisticsId(Integer orderLogisticsId) {
+        this.orderLogisticsId = orderLogisticsId;
+        return this;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public OrderPageBO setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+        return this;
+    }
+
+    public Integer getMoney() {
+        return money;
+    }
+
+    public OrderPageBO setMoney(Integer money) {
+        this.money = money;
+        return this;
+    }
+
+    public Date getPaymentTime() {
+        return paymentTime;
+    }
+
+    public OrderPageBO setPaymentTime(Date paymentTime) {
+        this.paymentTime = paymentTime;
+        return this;
+    }
+
+    public Date getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public OrderPageBO setDeliveryTime(Date deliveryTime) {
+        this.deliveryTime = deliveryTime;
+        return this;
+    }
+
+    public Date getReceiverTime() {
+        return receiverTime;
+    }
+
+    public OrderPageBO setReceiverTime(Date receiverTime) {
+        this.receiverTime = receiverTime;
+        return this;
+    }
+
+    public Date getClosingTime() {
+        return closingTime;
+    }
+
+    public OrderPageBO setClosingTime(Date closingTime) {
+        this.closingTime = closingTime;
+        return this;
+    }
+
+    public Integer getHasReturnExchange() {
+        return hasReturnExchange;
+    }
+
+    public OrderPageBO setHasReturnExchange(Integer hasReturnExchange) {
+        this.hasReturnExchange = hasReturnExchange;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public OrderPageBO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public OrderPageBO setRemark(String remark) {
+        this.remark = remark;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public OrderPageBO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public OrderPageBO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public OrderPageBO setDeleted(Integer deleted) {
+        this.deleted = deleted;
+        return this;
+    }
+}
--- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderQueryDTO.java
+++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderQueryDTO.java
@@ -0,0 +1,152 @@
+package cn.iocoder.mall.order.api.dto;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 订单 query
+ *
+ * @author Sin
+ * @time 2019-03-23 14:15
+ */
+public class OrderQueryDTO implements Serializable {
+
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 订单号
+     */
+    private String orderNo;
+    /**
+     * 用户 id
+     */
+    private Integer userId;
+    /**
+     * 付款时间（待发货）
+     */
+    private Date startPaymentTime;
+    private Date endPaymentTime;
+    /**
+     * 创建时间
+     */
+    private Date startCreateTime;
+    private Date endCreateTime;
+    /**
+     * 删除状态
+     */
+    private Integer deleted;
+
+    @NotNull(message = "页码不能为空")
+    private Integer pageNo;
+    @NotNull(message = "每页条数不能为空")
+    private Integer pageSize;
+
+    @Override
+    public String toString() {
+        return "OrderQueryDTO{" +
+                "id=" + id +
+                ", orderNo='" + orderNo + '\'' +
+                ", userId=" + userId +
+                ", startPaymentTime=" + startPaymentTime +
+                ", endPaymentTime=" + endPaymentTime +
+                ", startCreateTime=" + startCreateTime +
+                ", endCreateTime=" + endCreateTime +
+                ", deleted=" + deleted +
+                ", pageNo=" + pageNo +
+                ", pageSize=" + pageSize +
+                '}';
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public OrderQueryDTO setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public OrderQueryDTO setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public OrderQueryDTO setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public Date getStartPaymentTime() {
+        return startPaymentTime;
+    }
+
+    public OrderQueryDTO setStartPaymentTime(Date startPaymentTime) {
+        this.startPaymentTime = startPaymentTime;
+        return this;
+    }
+
+    public Date getEndPaymentTime() {
+        return endPaymentTime;
+    }
+
+    public OrderQueryDTO setEndPaymentTime(Date endPaymentTime) {
+        this.endPaymentTime = endPaymentTime;
+        return this;
+    }
+
+    public Date getStartCreateTime() {
+        return startCreateTime;
+    }
+
+    public OrderQueryDTO setStartCreateTime(Date startCreateTime) {
+        this.startCreateTime = startCreateTime;
+        return this;
+    }
+
+    public Date getEndCreateTime() {
+        return endCreateTime;
+    }
+
+    public OrderQueryDTO setEndCreateTime(Date endCreateTime) {
+        this.endCreateTime = endCreateTime;
+        return this;
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public OrderQueryDTO setDeleted(Integer deleted) {
+        this.deleted = deleted;
+        return this;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public OrderQueryDTO setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+        return this;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public OrderQueryDTO setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+        return this;
+    }
+}