From 11899dc62d10c1c7778fbebb631f5ee25705b7db Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 21:36:08 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 100 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java
index 9a34975..88566b1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java
@@ -174,4 +174,104 @@
@TableField(value = "refund_time")
private Date refundTime;
+ /**
+ * 自提点id
+ */
+ private Long pointId;
+
+ /**
+ * 配送单id
+ */
+ private Long deliveryId;
+
+ /**
+ * 配送单号
+ */
+ private String deliveryNo;
+
+
+ /**
+ * 订单状态(0.待付款 1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)
+ */
+ public interface status {
+ int dfk = 0;
+ int ddps = 1;
+ int psz = 2;
+ int dsh = 3;
+ int dpj = 4;
+ int ywc = 5;
+ int yqx = 6;
+ int ytk = 7;
+ }
+
+ /**
+ * 支付状态(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 "ComShopFlowerOrderDO{" +
+ "id=" + id +
+ ", storeId=" + storeId +
+ ", userId=" + userId +
+ ", orderNo='" + orderNo + '\'' +
+ ", payNo='" + payNo + '\'' +
+ ", wxTardeNo='" + wxTardeNo + '\'' +
+ ", status=" + status +
+ ", payStatus=" + payStatus +
+ ", receiverId=" + receiverId +
+ ", deleteStatus=" + deleteStatus +
+ ", totalAmount=" + totalAmount +
+ ", discountAmount=" + discountAmount +
+ ", payAmount=" + payAmount +
+ ", payType=" + payType +
+ ", payTime=" + payTime +
+ ", deliveryType=" + deliveryType +
+ ", deliveryStatus=" + deliveryStatus +
+ ", remark='" + remark + '\'' +
+ ", logisticsCompany='" + logisticsCompany + '\'' +
+ ", logisticsNo='" + logisticsNo + '\'' +
+ ", createAt=" + createAt +
+ ", updateAt=" + updateAt +
+ ", deliveryTime=" + deliveryTime +
+ ", serviceTime=" + serviceTime +
+ ", receivingTime=" + receivingTime +
+ ", refundTime=" + refundTime +
+ '}';
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1