From 5d5398edf4a42fb84e1ce6bc143be72afd01e722 Mon Sep 17 00:00:00 2001
From: clunt <clunt@vip.163.com>
Date: Sun, 24 Apr 2022 13:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95/=E5=AD=90?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E5=AE=9E=E4=BD=93=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/order/domain/OrderDetail.java     | 44 ++++++++++++++++++-
 .../ghy/order/domain/OrderDetailGoods.java    | 15 +++++++
 .../com/ghy/order/domain/OrderMaster.java     | 32 ++++++++++++++
 .../ghy/order/domain/OrderMasterGoods.java    | 12 +++++
 4 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 ghy-order/src/main/java/com/ghy/order/domain/OrderDetailGoods.java
 create mode 100644 ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java

diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
index 9a4407de..1a0e038a 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
@@ -1,11 +1,53 @@
 package com.ghy.order.domain;
 
+import com.ghy.common.annotation.Excel;
+import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
+
 /**
  * @author clunt
  * 细单表(转派后产生的订单)
  */
-public class OrderDetail {
+@Data
+public class OrderDetail extends BaseEntity {
 
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC)
+    private Long id;
+
+    @Excel(name = "订单编码", cellType = Excel.ColumnType.STRING)
+    private String code;
+
+    @Excel(name = "主单id", cellType = Excel.ColumnType.NUMERIC)
+    private Integer orderMasterId;
+
+    @Excel(name = "主单编码", cellType = Excel.ColumnType.STRING)
+    private String orderMasterCode;
+
+    @Excel(name = "消费者用户id", cellType = Excel.ColumnType.NUMERIC)
+    private Long customerId;
+
+    @Excel(name = "订单类型", cellType = Excel.ColumnType.NUMERIC)
+    private Integer orderType;
+
+    @Excel(name = "订单状态", cellType = Excel.ColumnType.NUMERIC)
+    private Integer orderStatus;
+
+    @Excel(name = "接单师傅id", cellType = Excel.ColumnType.NUMERIC)
+    private Integer workerId;
+
+    @Excel(name = "付款时间", cellType = Excel.ColumnType.STRING)
+    private String payTime;
+
+    @Excel(name = "接单时间", cellType = Excel.ColumnType.STRING)
+    private String revTime;
+
+    @Excel(name = "服务开始时间/上门时间", cellType = Excel.ColumnType.STRING)
+    private String workBeginTime;
+
+    @Excel(name = "服务完成时间", cellType = Excel.ColumnType.STRING)
+    private String workFinishTime;
 
 
 }
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailGoods.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailGoods.java
new file mode 100644
index 00000000..24a18c9d
--- /dev/null
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailGoods.java
@@ -0,0 +1,15 @@
+package com.ghy.order.domain;
+
+import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author clunt
+ * 拆单后细单关联商品
+ */
+@Data
+public class OrderDetailGoods extends BaseEntity {
+
+
+
+}
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
index 4625e3cc..5de283f5 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
@@ -1,7 +1,9 @@
 package com.ghy.order.domain;
 
+import com.ghy.common.annotation.Excel;
 import com.ghy.common.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author clunt
@@ -12,4 +14,34 @@ public class OrderMaster extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+    @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC)
+    private Long id;
+
+    @Excel(name = "订单编码", cellType = Excel.ColumnType.STRING)
+    private String code;
+
+    @Excel(name = "消费者用户id", cellType = Excel.ColumnType.NUMERIC)
+    private Long customerId;
+
+    @Excel(name = "订单类型", cellType = Excel.ColumnType.NUMERIC)
+    private Integer orderType;
+
+    @Excel(name = "订单状态", cellType = Excel.ColumnType.NUMERIC)
+    private Integer orderStatus;
+
+    @Excel(name = "付款类型",cellType = Excel.ColumnType.NUMERIC)
+    private Integer payType;
+
+    @Excel(name = "付款状态", cellType = Excel.ColumnType.NUMERIC)
+    private Integer payStatus;
+
+    @Excel(name = "接单师傅id", cellType = Excel.ColumnType.NUMERIC)
+    private Integer workerId;
+
+    @Excel(name = "付款时间间", cellType = Excel.ColumnType.STRING)
+    private String payTime;
+
+    @Excel(name = "接单时间", cellType = Excel.ColumnType.STRING)
+    private String revTime;
+
 }
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java
new file mode 100644
index 00000000..5fbd7e3d
--- /dev/null
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java
@@ -0,0 +1,12 @@
+package com.ghy.order.domain;
+
+import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author clunt
+ * 主单关联商品，即所有商品清单
+ */
+@Data
+public class OrderMasterGoods extends BaseEntity {
+}