From bae42356684138720f1613b8d887034bf4d62cc0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 24 Oct 2023 14:15:14 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
index cce3092..072fd1e 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -62,6 +63,34 @@
*/
private Integer delFlag;
+ /**
+ * 确认收货时间
+ */
+ private Date receivingTime;
+
@TableField(exist = false)
private List<MallOrderItem> items;
+
+ private String payImage;
+
+ private String payTradeNo;
+
+ /**
+ * 订单类型 1-普通订单 2-积分订单
+ */
+ private Integer orderType;
+
+ private BigDecimal carriage;
+
+ private Integer commentState;
+ /**
+ * 评价状态 1：待评价 2：已评价
+ */
+ public static final Integer COMMENT_STATE_NO = 1;
+ public static final Integer COMMENT_STATE_YES = 2;
+
+ //配送方式 1：快递寄送2：到店自提
+ private Integer deliverType;
+
+ private Long shopId;
}
--
Gitblit v1.9.1