From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java | 68 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
index 5635da3..ae3a87b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
@@ -67,7 +67,7 @@
private Long receiverId;
/**
- * 删除状态(1.未删除 2.已删除)
+ * 是否已删除（1.是 2.否）
*/
private Integer deleteStatus;
@@ -117,6 +117,16 @@
private String logisticsNo;
/**
+ * 订单备注
+ */
+ private String remark;
+
+ /**
+ * 发货时间
+ */
+ private Date deliveryTime;
+
+ /**
* 下单时间
*/
@TableField(fill = FieldFill.INSERT)
@@ -128,6 +138,62 @@
@TableField(fill = FieldFill.UPDATE)
private Date updateAt;
+ /**
+ * 收货时间
+ */
+ private Date receivingTime;
+
+ /**
+ * 订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)
+ */
+ public interface status{
+ int dfk = 1;
+ int dfh = 2;
+ int dsh = 3;
+ int dpj = 4;
+ int ywc = 5;
+ int yqx = 6;
+ }
+
+ /**
+ * 支付状态(1.未支付 2.已支付)
+ */
+ public interface payStatus{
+ int no = 1;
+ int yes = 2;
+ }
+
+ /**
+ * 删除状态(1.未删除 2.已删除)
+ */
+ public interface deleteStatus{
+ int no = 1;
+ int yes = 2;
+ }
+
+ /**
+ * 支付方式（1.微信支付）
+ */
+ public interface payType{
+ int wx = 1;
+ }
+
+ /**
+ * 配送方式（1.商家配送 2.快递物流）
+ */
+ public interface deliveryType{
+ int store = 1;
+ int express = 2;
+ }
+
+ /**
+ * 订单发货状态（1.未发货 2.已发货）
+ */
+ public interface deliveryStatus{
+ int no = 1;
+ int yes = 2;
+ }
+
@Override
public String toString() {
return "ComShopOrderDO{" +
--
Gitblit v1.7.1