Skip to content

Y
yudao-cloud
提交 d844a624 authored 作者: sin's avatar sin
浏览文件
操作

重新对 order 进行查分，给芋艿哥哥看看哈~

上级 45dfd137
隐藏空白字符变更
内嵌 并排
正在显示 包含 797 行增加 和 115 行删除
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderDO.java
浏览文件 @ d844a624
...@@ -12,9 +12,13 @@ import java.util.Date; ...@@ -12,9 +12,13 @@ import java.util.Date;
public class OrderDO implements Serializable { public class OrderDO implements Serializable {
/** /**
* 编号 * id
*/ */
private Integer id; private Integer id;
/**
* 物流id
*/
private Integer orderLogisticsId;
/** /**
* 订单编号 * 订单编号
*/ */
...@@ -23,42 +27,57 @@ public class OrderDO implements Serializable { ...@@ -23,42 +27,57 @@ public class OrderDO implements Serializable {
* 交易金额 * 交易金额
*/ */
private Integer price; private Integer price;
///
/// 时间信息
/** /**
* 收件区域编号 * 创建时间
*/ */
private String receiverAreaNo; private Date createTime;
/** /**
* 收件人名称 * 付款时间
*/ */
private String receiverName; private Date paymentTime;
/** /**
* 收件手机号 * 发货时间
*/ */
private String receiverMobile; private Date deliveryTime;
/** /**
* 收件详细地址 * 收货时间
*/ */
private String receiverAddress; private Date receiverTime;
/** /**
* 状态(如果有多个商品分开发货需要全部商品发完才会改变状态) * 成交时间
*/
private Date closingTime;
///
/// 其他
/**
* 是否退货
* *
* - 0、代发货 * - 0、no
* - 1、已发货 * - 1、yes
* - 2、已收货
* - 20、换货中
* - 21、换货成功
* - 40、退货中
* - 41、已退货
*/ */
private Integer status; private Integer hasReturn;
/** /**
* 支付状态 * 是否换货
* *
* - 0、待支付 * - 0、no
* - 1、支付完成 * - 1、yes
*/
private Integer hasExchange;
/**
* 状态(如果有多个商品分开发货需要全部商品发完才会改变状态)
*
* - 0、代付款
* - 1、已付款
* - 2、已退款 * - 2、已退款
* - 3、已完成
*/ */
private Integer payStatus; private Integer status;
/** /**
* 删除状态 * 删除状态
* *
...@@ -66,22 +85,6 @@ public class OrderDO implements Serializable { ...@@ -66,22 +85,6 @@ public class OrderDO implements Serializable {
* - 1 已删除 * - 1 已删除
*/ */
private Integer deleteStatus; private Integer deleteStatus;
/**
* 订单创建时间
*/
private Date createTime;
/**
* 付款时间
*/
private Date paymentTime;
/**
* 发货时间
*/
private Date deliveryTime;
/**
* 成交时间
*/
private Date closingTime;
/** /**
* 备注 * 备注
*/ */
...@@ -91,19 +94,18 @@ public class OrderDO implements Serializable { ...@@ -91,19 +94,18 @@ public class OrderDO implements Serializable {
public String toString() { public String toString() {
return "OrderDO{" + return "OrderDO{" +
"id=" + id + "id=" + id +
", orderLogisticsId=" + orderLogisticsId +
", orderNo='" + orderNo + '\'' + ", orderNo='" + orderNo + '\'' +
", price=" + price + ", price=" + price +
", receiverAreaNo='" + receiverAreaNo + '\'' +
", receiverName='" + receiverName + '\'' +
", receiverMobile='" + receiverMobile + '\'' +
", receiverAddress='" + receiverAddress + '\'' +
", status=" + status +
", payStatus=" + payStatus +
", deleteStatus=" + deleteStatus +
", createTime=" + createTime + ", createTime=" + createTime +
", paymentTime=" + paymentTime + ", paymentTime=" + paymentTime +
", deliveryTime=" + deliveryTime + ", deliveryTime=" + deliveryTime +
", receiverTime=" + receiverTime +
", closingTime=" + closingTime + ", closingTime=" + closingTime +
", hasReturn=" + hasReturn +
", hasExchange=" + hasExchange +
", status=" + status +
", deleteStatus=" + deleteStatus +
", remark='" + remark + '\'' + ", remark='" + remark + '\'' +
'}'; '}';
} }
...@@ -117,6 +119,15 @@ public class OrderDO implements Serializable { ...@@ -117,6 +119,15 @@ public class OrderDO implements Serializable {
return this; return this;
} }
public Integer getOrderLogisticsId() {
return orderLogisticsId;
}
public OrderDO setOrderLogisticsId(Integer orderLogisticsId) {
this.orderLogisticsId = orderLogisticsId;
return this;
}
public String getOrderNo() { public String getOrderNo() {
return orderNo; return orderNo;
} }
...@@ -135,102 +146,84 @@ public class OrderDO implements Serializable { ...@@ -135,102 +146,84 @@ public class OrderDO implements Serializable {
return this; return this;
} }
public String getReceiverAreaNo() { public Date getCreateTime() {
return receiverAreaNo; return createTime;
}
public OrderDO setReceiverAreaNo(String receiverAreaNo) {
this.receiverAreaNo = receiverAreaNo;
return this;
}
public String getReceiverName() {
return receiverName;
}
public OrderDO setReceiverName(String receiverName) {
this.receiverName = receiverName;
return this;
}
public String getReceiverMobile() {
return receiverMobile;
} }
public OrderDO setReceiverMobile(String receiverMobile) { public OrderDO setCreateTime(Date createTime) {
this.receiverMobile = receiverMobile; this.createTime = createTime;
return this; return this;
} }
public String getReceiverAddress() { public Date getPaymentTime() {
return receiverAddress; return paymentTime;
} }
public OrderDO setReceiverAddress(String receiverAddress) { public OrderDO setPaymentTime(Date paymentTime) {
this.receiverAddress = receiverAddress; this.paymentTime = paymentTime;
return this; return this;
} }
public Integer getStatus() { public Date getDeliveryTime() {
return status; return deliveryTime;
} }
public OrderDO setStatus(Integer status) { public OrderDO setDeliveryTime(Date deliveryTime) {
this.status = status; this.deliveryTime = deliveryTime;
return this; return this;
} }
public Integer getPayStatus() { public Date getReceiverTime() {
return payStatus; return receiverTime;
} }
public OrderDO setPayStatus(Integer payStatus) { public OrderDO setReceiverTime(Date receiverTime) {
this.payStatus = payStatus; this.receiverTime = receiverTime;
return this; return this;
} }
public Integer getDeleteStatus() { public Date getClosingTime() {
return deleteStatus; return closingTime;
} }
public OrderDO setDeleteStatus(Integer deleteStatus) { public OrderDO setClosingTime(Date closingTime) {
this.deleteStatus = deleteStatus; this.closingTime = closingTime;
return this; return this;
} }
public Date getCreateTime() { public Integer getHasReturn() {
return createTime; return hasReturn;
} }
public OrderDO setCreateTime(Date createTime) { public OrderDO setHasReturn(Integer hasReturn) {
this.createTime = createTime; this.hasReturn = hasReturn;
return this; return this;
} }
public Date getPaymentTime() { public Integer getHasExchange() {
return paymentTime; return hasExchange;
} }
public OrderDO setPaymentTime(Date paymentTime) { public OrderDO setHasExchange(Integer hasExchange) {
this.paymentTime = paymentTime; this.hasExchange = hasExchange;
return this; return this;
} }
public Date getDeliveryTime() { public Integer getStatus() {
return deliveryTime; return status;
} }
public OrderDO setDeliveryTime(Date deliveryTime) { public OrderDO setStatus(Integer status) {
this.deliveryTime = deliveryTime; this.status = status;
return this; return this;
} }
public Date getClosingTime() { public Integer getDeleteStatus() {
return closingTime; return deleteStatus;
} }
public OrderDO setClosingTime(Date closingTime) { public OrderDO setDeleteStatus(Integer deleteStatus) {
this.closingTime = closingTime; this.deleteStatus = deleteStatus;
return this; return this;
} }
......
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderExchangeDO.java 0 → 100644
浏览文件 @ d844a624
package cn.iocoder.mall.order.dataobject;
import java.io.Serializable;
import java.util.Date;
/**
* 换货订单
*
* @author Sin
* @time 2019-03-19 19:48
*/
public class OrderExchangeDO implements Serializable {
/**
* id
*/
private Integer id;
/**
* 订单id
*/
private Integer orderId;
/**
* 订单编号
*/
private String orderNo;
/**
* 换货物流id
*/
private Integer exchangeOrderLogisticsId;
/**
* 收件物流id
*/
private Integer receiverOrderLogisticsId;
///
/// 时间信息
/**
* 创建时间
*/
private Date createTime;
/**
* 付款时间
*/
private Date paymentTime;
/**
* 发货时间
*/
private Date deliveryTime;
/**
* 收货时间
*/
private Date receiverTime;
/**
* 成交时间
*/
private Date closingTime;
///
/// 其他
/**
* 状态
*
* - 申请换货
* - 申请成功
* - 申请失败
* - 换货中
* - 换货成功
*/
private Integer status;
@Override
public String toString() {
return "OrderExchangeDO{" +
"id=" + id +
", orderId=" + orderId +
", orderNo='" + orderNo + '\'' +
", exchangeOrderLogisticsId=" + exchangeOrderLogisticsId +
", receiverOrderLogisticsId=" + receiverOrderLogisticsId +
", createTime=" + createTime +
", paymentTime=" + paymentTime +
", deliveryTime=" + deliveryTime +
", receiverTime=" + receiverTime +
", closingTime=" + closingTime +
", status=" + status +
'}';
}
public Integer getId() {
return id;
}
public OrderExchangeDO setId(Integer id) {
this.id = id;
return this;
}
public Integer getOrderId() {
return orderId;
}
public OrderExchangeDO setOrderId(Integer orderId) {
this.orderId = orderId;
return this;
}
public String getOrderNo() {
return orderNo;
}
public OrderExchangeDO setOrderNo(String orderNo) {
this.orderNo = orderNo;
return this;
}
public Integer getExchangeOrderLogisticsId() {
return exchangeOrderLogisticsId;
}
public OrderExchangeDO setExchangeOrderLogisticsId(Integer exchangeOrderLogisticsId) {
this.exchangeOrderLogisticsId = exchangeOrderLogisticsId;
return this;
}
public Integer getReceiverOrderLogisticsId() {
return receiverOrderLogisticsId;
}
public OrderExchangeDO setReceiverOrderLogisticsId(Integer receiverOrderLogisticsId) {
this.receiverOrderLogisticsId = receiverOrderLogisticsId;
return this;
}
public Date getCreateTime() {
return createTime;
}
public OrderExchangeDO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getPaymentTime() {
return paymentTime;
}
public OrderExchangeDO setPaymentTime(Date paymentTime) {
this.paymentTime = paymentTime;
return this;
}
public Date getDeliveryTime() {
return deliveryTime;
}
public OrderExchangeDO setDeliveryTime(Date deliveryTime) {
this.deliveryTime = deliveryTime;
return this;
}
public Date getReceiverTime() {
return receiverTime;
}
public OrderExchangeDO setReceiverTime(Date receiverTime) {
this.receiverTime = receiverTime;
return this;
}
public Date getClosingTime() {
return closingTime;
}
public OrderExchangeDO setClosingTime(Date closingTime) {
this.closingTime = closingTime;
return this;
}
public Integer getStatus() {
return status;
}
public OrderExchangeDO setStatus(Integer status) {
this.status = status;
return this;
}
}
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderItemDO.java
浏览文件 @ d844a624
...@@ -19,6 +19,10 @@ public class OrderItemDO implements Serializable { ...@@ -19,6 +19,10 @@ public class OrderItemDO implements Serializable {
* 订单编号 * 订单编号
*/ */
private Integer orderId; private Integer orderId;
/**
* 订单号
*/
private String orderNo;
/** /**
* 商品编号 * 商品编号
*/ */
...@@ -31,33 +35,75 @@ public class OrderItemDO implements Serializable { ...@@ -31,33 +35,75 @@ public class OrderItemDO implements Serializable {
* 金额(分) * 金额(分)
*/ */
private Integer price; private Integer price;
///
/// 时间信息
/** /**
* 状态 * 创建时间
*
* - 0、代发货
* - 1、已发货
* - 2、已收货
* - 20、换货中
* - 21、换货成功
* - 40、退货中
* - 41、已退货
*/ */
private Integer status; private Date createTime;
/**
* 付款时间
*/
private Date paymentTime;
/** /**
* 发货时间 * 发货时间
*/ */
private Date deliveryTime; private Date deliveryTime;
/**
* 收货时间
*/
private Date receiverTime;
/**
* 成交时间
*/
private Date closingTime;
///
/// 其他
/**
* 是否退货
*
* - 0、no
* - 1、yes
*/
private Integer hasReturn;
/**
* 是否换货
*
* - 0、no
* - 1、yes
*/
private Integer hasExchange;
/**
* 状态
*
* - 0、代付款
* - 1、已付款
* - 2、已退款
* - 3、已完成
*/
private Integer status;
@Override @Override
public String toString() { public String toString() {
return "OrderItemDO{" + return "OrderItemDO{" +
"id=" + id + "id=" + id +
", orderId='" + orderId + '\'' + ", orderId=" + orderId +
", orderNo='" + orderNo + '\'' +
", commodityId='" + commodityId + '\'' + ", commodityId='" + commodityId + '\'' +
", quantity=" + quantity + ", quantity=" + quantity +
", price=" + price + ", price=" + price +
", status=" + status + ", createTime=" + createTime +
", paymentTime=" + paymentTime +
", deliveryTime=" + deliveryTime + ", deliveryTime=" + deliveryTime +
", receiverTime=" + receiverTime +
", closingTime=" + closingTime +
", hasReturn=" + hasReturn +
", hasExchange=" + hasExchange +
", status=" + status +
'}'; '}';
} }
...@@ -79,6 +125,15 @@ public class OrderItemDO implements Serializable { ...@@ -79,6 +125,15 @@ public class OrderItemDO implements Serializable {
return this; return this;
} }
public String getOrderNo() {
return orderNo;
}
public OrderItemDO setOrderNo(String orderNo) {
this.orderNo = orderNo;
return this;
}
public String getCommodityId() { public String getCommodityId() {
return commodityId; return commodityId;
} }
...@@ -106,12 +161,21 @@ public class OrderItemDO implements Serializable { ...@@ -106,12 +161,21 @@ public class OrderItemDO implements Serializable {
return this; return this;
} }
public Integer getStatus() { public Date getCreateTime() {
return status; return createTime;
} }
public OrderItemDO setStatus(Integer status) { public OrderItemDO setCreateTime(Date createTime) {
this.status = status; this.createTime = createTime;
return this;
}
public Date getPaymentTime() {
return paymentTime;
}
public OrderItemDO setPaymentTime(Date paymentTime) {
this.paymentTime = paymentTime;
return this; return this;
} }
...@@ -123,4 +187,49 @@ public class OrderItemDO implements Serializable { ...@@ -123,4 +187,49 @@ public class OrderItemDO implements Serializable {
this.deliveryTime = deliveryTime; this.deliveryTime = deliveryTime;
return this; return this;
} }
public Date getReceiverTime() {
return receiverTime;
}
public OrderItemDO setReceiverTime(Date receiverTime) {
this.receiverTime = receiverTime;
return this;
}
public Date getClosingTime() {
return closingTime;
}
public OrderItemDO setClosingTime(Date closingTime) {
this.closingTime = closingTime;
return this;
}
public Integer getHasReturn() {
return hasReturn;
}
public OrderItemDO setHasReturn(Integer hasReturn) {
this.hasReturn = hasReturn;
return this;
}
public Integer getHasExchange() {
return hasExchange;
}
public OrderItemDO setHasExchange(Integer hasExchange) {
this.hasExchange = hasExchange;
return this;
}
public Integer getStatus() {
return status;
}
public OrderItemDO setStatus(Integer status) {
this.status = status;
return this;
}
} }
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderLogisticsDO.java 0 → 100644
浏览文件 @ d844a624
package cn.iocoder.mall.order.dataobject;
import java.io.Serializable;
/**
* 订单物流信息
*
* @author Sin
* @time 2019-03-19 20:47
*/
public class OrderLogisticsDO implements Serializable {
/**
* id
*/
private Integer id;
/**
* 收件区域编号
*/
private String areaNo;
/**
* 收件人名称
*/
private String name;
/**
* 收件手机号
*/
private String mobile;
/**
* 收件详细地址
*/
private String address;
/**
* 物流编号
*/
private String logisticsNo;
@Override
public String toString() {
return "OrderLogisticsDO{" +
"id=" + id +
", areaNo='" + areaNo + '\'' +
", name='" + name + '\'' +
", mobile='" + mobile + '\'' +
", address='" + address + '\'' +
", logisticsNo='" + logisticsNo + '\'' +
'}';
}
public Integer getId() {
return id;
}
public OrderLogisticsDO setId(Integer id) {
this.id = id;
return this;
}
public String getAreaNo() {
return areaNo;
}
public OrderLogisticsDO setAreaNo(String areaNo) {
this.areaNo = areaNo;
return this;
}
public String getName() {
return name;
}
public OrderLogisticsDO setName(String name) {
this.name = name;
return this;
}
public String getMobile() {
return mobile;
}
public OrderLogisticsDO setMobile(String mobile) {
this.mobile = mobile;
return this;
}
public String getAddress() {
return address;
}
public OrderLogisticsDO setAddress(String address) {
this.address = address;
return this;
}
public String getLogisticsNo() {
return logisticsNo;
}
public OrderLogisticsDO setLogisticsNo(String logisticsNo) {
this.logisticsNo = logisticsNo;
return this;
}
}
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderLogisticsDetailDO.java 0 → 100644
浏览文件 @ d844a624
package cn.iocoder.mall.order.dataobject;
import java.io.Serializable;
import java.util.Date;
/**
* 订单物流 - 详细信息
*
* - 同步第三方物流信息
*
* @author Sin
* @time 2019-03-19 20:48
*/
public class OrderLogisticsDetailDO implements Serializable {
/**
* id
*/
private Integer id;
/**
* 物流id
*/
private Integer orderLogisticsId;
/**
* 物流时间
*/
private Date logisticsTime;
/**
* 物流信息
*/
private String logisticsInformation;
/**
* 创建时间（同步时间）
*/
private Date createTime;
@Override
public String toString() {
return "OrderLogisticsDetailDO{" +
"id=" + id +
", orderLogisticsId=" + orderLogisticsId +
", logisticsTime=" + logisticsTime +
", logisticsInformation='" + logisticsInformation + '\'' +
", createTime=" + createTime +
'}';
}
public Integer getId() {
return id;
}
public OrderLogisticsDetailDO setId(Integer id) {
this.id = id;
return this;
}
public Integer getOrderLogisticsId() {
return orderLogisticsId;
}
public OrderLogisticsDetailDO setOrderLogisticsId(Integer orderLogisticsId) {
this.orderLogisticsId = orderLogisticsId;
return this;
}
public Date getLogisticsTime() {
return logisticsTime;
}
public OrderLogisticsDetailDO setLogisticsTime(Date logisticsTime) {
this.logisticsTime = logisticsTime;
return this;
}
public String getLogisticsInformation() {
return logisticsInformation;
}
public OrderLogisticsDetailDO setLogisticsInformation(String logisticsInformation) {
this.logisticsInformation = logisticsInformation;
return this;
}
public Date getCreateTime() {
return createTime;
}
public OrderLogisticsDetailDO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
}
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderReturnDO.java 0 → 100644
浏览文件 @ d844a624
package cn.iocoder.mall.order.dataobject;
import java.io.Serializable;
import java.util.Date;
/**
* 退货订单
*
* @author Sin
* @time 2019-03-19 19:48
*/
public class OrderReturnDO implements Serializable {
/**
* 编号自动增长
*/
private Integer id;
/**
* 订单编号
*/
private Integer orderId;
/**
* 订单号 （保存一个冗余）
*/
private String orderNo;
/**
* 订单 item 编号
*/
private Integer orderItemId;
///
/// 时间信息
/**
* 创建时间
*/
private Date createTime;
/**
* 同意时间
*/
private Date approvalTime;
/**
* 物流时间（填写物流单号时间）
*/
private Date logisticsTime;
/**
* 收货时间
*/
private Date receiverTime;
/**
* 成交时间（确认时间）
*/
private Date closingTime;
///
/// 其他
/**
* 订单类型
*
* - 0、为 Order 订单 （对整个订单退货）
* - 1、为 OrderItem 订单 （对订单某一个商品退货）
*/
private Integer orderType;
/**
* 状态
*
* - 0、退货申请
* - 1、申请成功
* - 2、申请失败
* - 3、退货中
* - 4、退货成功
*/
private Integer status;
@Override
public String toString() {
return "OrderReturnDO{" +
"id=" + id +
", orderId=" + orderId +
", orderNo='" + orderNo + '\'' +
", orderItemId=" + orderItemId +
", createTime=" + createTime +
", approvalTime=" + approvalTime +
", logisticsTime=" + logisticsTime +
", receiverTime=" + receiverTime +
", closingTime=" + closingTime +
", orderType=" + orderType +
", status=" + status +
'}';
}
public Integer getId() {
return id;
}
public OrderReturnDO setId(Integer id) {
this.id = id;
return this;
}
public Integer getOrderId() {
return orderId;
}
public OrderReturnDO setOrderId(Integer orderId) {
this.orderId = orderId;
return this;
}
public String getOrderNo() {
return orderNo;
}
public OrderReturnDO setOrderNo(String orderNo) {
this.orderNo = orderNo;
return this;
}
public Integer getOrderItemId() {
return orderItemId;
}
public OrderReturnDO setOrderItemId(Integer orderItemId) {
this.orderItemId = orderItemId;
return this;
}
public Date getCreateTime() {
return createTime;
}
public OrderReturnDO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getApprovalTime() {
return approvalTime;
}
public OrderReturnDO setApprovalTime(Date approvalTime) {
this.approvalTime = approvalTime;
return this;
}
public Date getLogisticsTime() {
return logisticsTime;
}
public OrderReturnDO setLogisticsTime(Date logisticsTime) {
this.logisticsTime = logisticsTime;
return this;
}
public Date getReceiverTime() {
return receiverTime;
}
public OrderReturnDO setReceiverTime(Date receiverTime) {
this.receiverTime = receiverTime;
return this;
}
public Date getClosingTime() {
return closingTime;
}
public OrderReturnDO setClosingTime(Date closingTime) {
this.closingTime = closingTime;
return this;
}
public Integer getOrderType() {
return orderType;
}
public OrderReturnDO setOrderType(Integer orderType) {
this.orderType = orderType;
return this;
}
public Integer getStatus() {
return status;
}
public OrderReturnDO setStatus(Integer status) {
this.status = status;
return this;
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论