yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/1/head
YunaiV 2019-03-20 23:23:50 +08:00
parent f2125e49cf 8df0b3fa6c
commit e3a14c2abb
11 changed files with 279 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/common-framework/src/main/java/cn/iocoder/common/framework/dataobject/BaseDO.java
View File

@ -1,11 +1,12 @@
package cn.iocoder.common.framework.dataobject;
import java.io.Serializable;
import java.util.Date;
/**
* 基础实体对象
*/
public class BaseDO {
public class BaseDO implements Serializable {
/**
* 是否删除 - 是

40
order/order-service-impl/src/main/java/cn/iocoder/mall/order/constants/OrderExchangeReasonEnum.java Normal file
View File

@ -0,0 +1,40 @@
package cn.iocoder.mall.order.constants;
/**
* 订单换货原因
*
* @author Sin
* @time 2019-03-20 21:17
*/
public enum OrderExchangeReasonEnum {
REASON_000(0, "其他"),
REASON_001(1, "尺码不合适"),
REASON_002(2, "质量问题"),
REASON_003(3, "不喜欢"),
;
private Integer value;
private String name;
OrderExchangeReasonEnum(Integer value, String name) {
this.value = value;
this.name = name;
}
@Override
public String toString() {
return "OrderCommonReasonEnum{" +
"value=" + value +
", name=" + name +
'}';
}
public Integer getValue() {
return value;
}
public String getName() {
return name;
}}

52
order/order-service-impl/src/main/java/cn/iocoder/mall/order/constants/OrderReturnReasonEnum.java Normal file
View File

@ -0,0 +1,52 @@
package cn.iocoder.mall.order.constants;
/**
* 订单退货原因
*
* @author Sin
* @time 2019-03-20 21:17
*/
public enum OrderReturnReasonEnum {
///
/// 未发货情况
REASON_000(0, "其他"),
REASON_001(1, "拍错/勿拍/多拍"),
REASON_002(2, "缺货"),
///
/// 已发货情况
REASON_020(20, "七天无理由"),
REASON_021(21, "质量问题"),
REASON_022(22, "不想要了"),
;
// TODO: 2019-03-20 Sin 已发货情况 补全，需要对照一下 淘宝
private Integer value;
private String name;
OrderReturnReasonEnum(Integer value, String name) {
this.value = value;
this.name = name;
}
@Override
public String toString() {
return "OrderCommonReasonEnum{" +
"value=" + value +
", name=" + name +
'}';
}
public Integer getValue() {
return value;
}
public String getName() {
return name;
}}

7
order/order-service-impl/src/main/java/cn/iocoder/mall/order/constants/package-info.java Normal file
View File

@ -0,0 +1,7 @@
/**
* 定义常量，以及枚举信息
*
* @author Sin
* @time 2019-03-20 21:16
*/
package cn.iocoder.mall.order.constants;

60
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderDO.java
View File

@ -1,5 +1,7 @@
package cn.iocoder.mall.order.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import java.io.Serializable;
import java.util.Date;
@ -9,7 +11,7 @@ import java.util.Date;
* @author Sin
* @time 2019-03-16 13:49
*/
public class OrderDO implements Serializable {
public class OrderDO extends BaseDO {
/**
* id
@ -31,10 +33,6 @@ public class OrderDO implements Serializable {
///
/// 时间信息
/**
* 创建时间
*/
private Date createTime;
/**
* 付款时间
*/
@ -58,24 +56,20 @@ public class OrderDO implements Serializable {
/**
* 是否退货
*
* - 0、no
* - 1、yes
* - 0、没有
* - 1、换货
* - 2、退货
* - 3、换货 + 退货
*/
private Integer hasReturn;
/**
* 是否换货
*
* - 0、no
* - 1、yes
*/
private Integer hasExchange;
private Integer hasReturnExchange;
/**
* 状态(如果有多个商品分开发货需要全部商品发完才会改变状态)
*
* - 0、代付款
* - 1、已付款
* - 2、已退款
* - 0、待付款
* - 1、待发货
* - 2、待收获
* - 3、已完成
* - 4、已关闭
*/
private Integer status;
/**
@ -97,13 +91,11 @@ public class OrderDO implements Serializable {
", orderLogisticsId=" + orderLogisticsId +
", orderNo='" + orderNo + '\'' +
", price=" + price +
", createTime=" + createTime +
", paymentTime=" + paymentTime +
", deliveryTime=" + deliveryTime +
", receiverTime=" + receiverTime +
", closingTime=" + closingTime +
", hasReturn=" + hasReturn +
", hasExchange=" + hasExchange +
", hasReturnExchange=" + hasReturnExchange +
", status=" + status +
", deleteStatus=" + deleteStatus +
", remark='" + remark + '\'' +
@ -146,15 +138,6 @@ public class OrderDO implements Serializable {
return this;
}
public Date getCreateTime() {
return createTime;
}
public OrderDO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getPaymentTime() {
return paymentTime;
}
@ -191,21 +174,12 @@ public class OrderDO implements Serializable {
return this;
}
public Integer getHasReturn() {
return hasReturn;
public Integer getHasReturnExchange() {
return hasReturnExchange;
}
public OrderDO setHasReturn(Integer hasReturn) {
this.hasReturn = hasReturn;
return this;
}
public Integer getHasExchange() {
return hasExchange;
}
public OrderDO setHasExchange(Integer hasExchange) {
this.hasExchange = hasExchange;
public OrderDO setHasReturnExchange(Integer hasReturnExchange) {
this.hasReturnExchange = hasReturnExchange;
return this;
}

71
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderExchangeDO.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.mall.order.dataobject;
import java.io.Serializable;
import cn.iocoder.common.framework.dataobject.BaseDO;
import java.util.Date;
/**
@ -9,7 +10,7 @@ import java.util.Date;
* @author Sin
* @time 2019-03-19 19:48
*/
public class OrderExchangeDO implements Serializable {
public class OrderExchangeDO extends BaseDO {
/**
* id
@ -23,6 +24,14 @@ public class OrderExchangeDO implements Serializable {
* 订单编号
*/
private String orderNo;
/**
* 商品id（保存一个冗余，如果一个订单下存在多个商品，会有很大的作用）
*/
private String skuId;
/**
* 换货商品id
*/
private String exchangeSkuId;
/**
* 换货物流id
*/
@ -32,6 +41,22 @@ public class OrderExchangeDO implements Serializable {
*/
private Integer receiverOrderLogisticsId;
///
/// 原因
/**
* 原因 (关联字典)
*
* {@link cn.iocoder.mall.order.constants.OrderExchangeReasonEnum}
*/
private Integer orderReasonId;
/**
* 原因（如果选择其他，原因保存在这）
*
* {@link cn.iocoder.mall.order.constants.OrderExchangeReasonEnum#REASON_000}
*/
private String reason;
///
/// 时间信息
@ -76,8 +101,12 @@ public class OrderExchangeDO implements Serializable {
"id=" + id +
", orderId=" + orderId +
", orderNo='" + orderNo + '\'' +
", skuId='" + skuId + '\'' +
", exchangeSkuId='" + exchangeSkuId + '\'' +
", exchangeOrderLogisticsId=" + exchangeOrderLogisticsId +
", receiverOrderLogisticsId=" + receiverOrderLogisticsId +
", orderReasonId=" + orderReasonId +
", reason='" + reason + '\'' +
", createTime=" + createTime +
", paymentTime=" + paymentTime +
", deliveryTime=" + deliveryTime +
@ -114,6 +143,24 @@ public class OrderExchangeDO implements Serializable {
return this;
}
public String getSkuId() {
return skuId;
}
public OrderExchangeDO setSkuId(String skuId) {
this.skuId = skuId;
return this;
}
public String getExchangeSkuId() {
return exchangeSkuId;
}
public OrderExchangeDO setExchangeSkuId(String exchangeSkuId) {
this.exchangeSkuId = exchangeSkuId;
return this;
}
public Integer getExchangeOrderLogisticsId() {
return exchangeOrderLogisticsId;
}
@ -132,10 +179,30 @@ public class OrderExchangeDO implements Serializable {
return this;
}
public Integer getOrderReasonId() {
return orderReasonId;
}
public OrderExchangeDO setOrderReasonId(Integer orderReasonId) {
this.orderReasonId = orderReasonId;
return this;
}
public String getReason() {
return reason;
}
public OrderExchangeDO setReason(String reason) {
this.reason = reason;
return this;
}
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public OrderExchangeDO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;

26
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderItemDO.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.mall.order.dataobject;
import java.io.Serializable;
import cn.iocoder.common.framework.dataobject.BaseDO;
import java.util.Date;
/**
@ -9,7 +10,7 @@ import java.util.Date;
* @author Sin
* @time 2019-03-16 14:03
*/
public class OrderItemDO implements Serializable {
public class OrderItemDO extends BaseDO {
/**
* 编号
@ -26,7 +27,7 @@ public class OrderItemDO implements Serializable {
/**
* 商品编号
*/
private String commodityId;
private String skuId;
/**
* 数量
*/
@ -80,10 +81,11 @@ public class OrderItemDO implements Serializable {
/**
* 状态
*
* - 0、代付款
* - 1、已付款
* - 2、已退款
* - 0、待付款
* - 1、待发货
* - 2、待收获
* - 3、已完成
* - 4、已关闭
*/
private Integer status;
@ -93,7 +95,7 @@ public class OrderItemDO implements Serializable {
"id=" + id +
", orderId=" + orderId +
", orderNo='" + orderNo + '\'' +
", commodityId='" + commodityId + '\'' +
", skuId='" + skuId + '\'' +
", quantity=" + quantity +
", price=" + price +
", createTime=" + createTime +
@ -134,12 +136,12 @@ public class OrderItemDO implements Serializable {
return this;
}
public String getCommodityId() {
return commodityId;
public String getSkuId() {
return skuId;
}
public OrderItemDO setCommodityId(String commodityId) {
this.commodityId = commodityId;
public OrderItemDO setSkuId(String skuId) {
this.skuId = skuId;
return this;
}
@ -161,10 +163,12 @@ public class OrderItemDO implements Serializable {
return this;
}
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public OrderItemDO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;

4
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderLogisticsDO.java
View File

@ -1,6 +1,6 @@
package cn.iocoder.mall.order.dataobject;
import java.io.Serializable;
import cn.iocoder.common.framework.dataobject.BaseDO;
/**
* 订单物流信息
@ -8,7 +8,7 @@ import java.io.Serializable;
* @author Sin
* @time 2019-03-19 20:47
*/
public class OrderLogisticsDO implements Serializable {
public class OrderLogisticsDO extends BaseDO {
/**
* id

5
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderLogisticsDetailDO.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.mall.order.dataobject;
import java.io.Serializable;
import cn.iocoder.common.framework.dataobject.BaseDO;
import java.util.Date;
/**
@ -11,7 +12,7 @@ import java.util.Date;
* @author Sin
* @time 2019-03-19 20:48
*/
public class OrderLogisticsDetailDO implements Serializable {
public class OrderLogisticsDetailDO extends BaseDO {
/**
* id

57
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderReturnDO.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.mall.order.dataobject;
import java.io.Serializable;
import cn.iocoder.common.framework.dataobject.BaseDO;
import java.util.Date;
/**
@ -9,7 +10,7 @@ import java.util.Date;
* @author Sin
* @time 2019-03-19 19:48
*/
public class OrderReturnDO implements Serializable {
public class OrderReturnDO extends BaseDO {
/**
* 编号自动增长
@ -27,6 +28,26 @@ public class OrderReturnDO implements Serializable {
* 订单 item 编号
*/
private Integer orderItemId;
/**
* 商品编号（保存一个冗余，如果一个订单下存在多个商品，会有很大的作用）
*/
private String skuId;
///
/// 退货原因
/**
* 退货原因(字典值)
*
* {@link cn.iocoder.mall.order.constants.OrderReturnReasonEnum}
*/
private Integer orderReasonId;
/**
* 原因（如果选择其他，原因保存在这）
*
* {@link cn.iocoder.mall.order.constants.OrderReturnReasonEnum#REASON_000}
*/
private String reason;
///
/// 时间信息
@ -80,6 +101,9 @@ public class OrderReturnDO implements Serializable {
", orderId=" + orderId +
", orderNo='" + orderNo + '\'' +
", orderItemId=" + orderItemId +
", skuId='" + skuId + '\'' +
", orderReasonId=" + orderReasonId +
", reason='" + reason + '\'' +
", createTime=" + createTime +
", approvalTime=" + approvalTime +
", logisticsTime=" + logisticsTime +
@ -126,10 +150,39 @@ public class OrderReturnDO implements Serializable {
return this;
}
public String getSkuId() {
return skuId;
}
public OrderReturnDO setSkuId(String skuId) {
this.skuId = skuId;
return this;
}
public Integer getOrderReasonId() {
return orderReasonId;
}
public OrderReturnDO setOrderReasonId(Integer orderReasonId) {
this.orderReasonId = orderReasonId;
return this;
}
public String getReason() {
return reason;
}
public OrderReturnDO setReason(String reason) {
this.reason = reason;
return this;
}
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public OrderReturnDO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;

18
order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/README.md
View File

@ -2,4 +2,20 @@
## 订单
TODO
TODO
**退货**
1. 商家未发货，退货原因
- 拍错/勿拍/多拍
- 缺货
2. 商家已发货，退货原因
- 七天无理由
- 质量问题
- 不想要了
- 其他