From 97e758e26fd44d4b907daf509f8a014f3453d8b4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Jun 2021 15:12:28 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java      |   68 ++++++++++++++++++++++
 gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java |   26 ++++++++
 gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java       |   35 +++++++++++
 3 files changed, 129 insertions(+), 0 deletions(-)

diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java
new file mode 100644
index 0000000..1f12d08
--- /dev/null
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java
@@ -0,0 +1,35 @@
+package com.xzx.gc.entity;
+
+
+import com.xzx.gc.common.entity.BaseEntity;
+import lombok.Data;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "xzx_jhy_info")
+public class JhyInfo extends BaseEntity {
+
+    private String userId;
+
+    private String username;
+
+    private String gender;
+
+    private String mobile;
+
+    private String identity;
+
+    private String address;
+
+    private String lon;
+
+    private String lat;
+
+    private String cardPos;
+
+    /**
+     * 是否集物员 1-是 2-否
+     */
+    private String isJyh;
+}
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
new file mode 100644
index 0000000..c0fc58f
--- /dev/null
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
@@ -0,0 +1,68 @@
+package com.xzx.gc.entity;
+
+
+import com.xzx.gc.common.entity.BaseEntity;
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.util.Date;
+
+@Data
+@Table(name = "xzx_jhy_order")
+public class JhyOrder extends BaseEntity {
+
+    private String userId;
+
+    private String orderNo;
+
+    private String phone;
+
+    private String area;
+
+    private String address;
+
+    private Date reserveDate;
+
+    private String reserveTime;
+
+    private Date receivingTime;
+
+    private String longitude;
+
+    private String latitude;
+
+    private String weight;
+
+    /**
+     * 订单状态 状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消
+     */
+    private Integer status;
+
+    /**
+     * 评论
+     */
+    private String comment;
+
+    /**
+     * 分数
+     */
+    private Integer score;
+
+    /**
+     * 是否匿名 1-是 2-否
+     */
+    private Integer isAnonymous;
+
+    /**
+     * 是否已评论 1-是 2-否
+     */
+    private Integer isCommented;
+
+    private String remark;
+
+    /**
+     * 集物员ID
+     */
+    private String jyhId;
+
+}
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java
new file mode 100644
index 0000000..f7a0a6f
--- /dev/null
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java
@@ -0,0 +1,26 @@
+package com.xzx.gc.entity;
+
+import com.xzx.gc.common.entity.BaseEntity;
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+@Data
+@Table(name = "xzx_jhy_order_items")
+public class JhyOrderItems extends BaseEntity {
+
+    private Long orderId;
+
+    private String title;
+
+    private BigDecimal price;
+
+    private String picture;
+
+    private String remark;
+
+    private BigDecimal weight;
+
+    private String score;
+}

--
Gitblit v1.9.1