From da101b5826d7ab8adebbde3582b50ffc85730d26 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期日, 24 七月 2022 16:56:22 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java | 110 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 30 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..775a485 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
@@ -1,12 +1,12 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @auther lyq
@@ -23,7 +23,7 @@
/**
* 订单id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -67,7 +67,7 @@
private Long receiverId;
/**
- * 删除状态(1.未删除 2.已删除)
+ * 是否已删除（1.是 2.否）
*/
private Integer deleteStatus;
@@ -97,12 +97,12 @@
private Date payTime;
/**
- * 配送方式（1.商家配送 2.快递物流）
+ * 配送方式（1.商家配送 2.快递物流）
*/
private Integer deliveryType;
/**
- * 订单发货状态（1.未发货 2.已发货）
+ * 订单发货状态（1.未发货 2.已发货）
*/
private Integer deliveryStatus;
@@ -117,6 +117,16 @@
private String logisticsNo;
/**
+ * 订单备注
+ */
+ private String remark;
+
+ /**
+ * 发货时间
+ */
+ private Date deliveryTime;
+
+ /**
* 下单时间
*/
@TableField(fill = FieldFill.INSERT)
@@ -128,30 +138,70 @@
@TableField(fill = FieldFill.UPDATE)
private Date updateAt;
+ /**
+ * 收货时间
+ */
+ private Date receivingTime;
+
@Override
public String toString() {
- return "ComShopOrderDO{" +
- "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 +
- ", logisticsCompany=" + logisticsCompany +
- ", logisticsNo=" + logisticsNo +
- ", createAt=" + createAt +
- ", updateAt=" + updateAt +
- "}";
+ return "ComShopOrderDO{" + "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 + ", logisticsCompany="
+ + logisticsCompany + ", logisticsNo=" + logisticsNo + ", createAt=" + createAt + ", updateAt=" + updateAt
+ + "}";
+ }
+
+ /**
+ * 订单状态(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;
}
}
\ No newline at end of file
--
Gitblit v1.7.1