From 5aad7ef3aef4ebf8ab6462e6e5b89425ab5d426c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 23 Jun 2022 18:03:23 +0800
Subject: [PATCH] 20220528
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 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 fa133c2..2eedb6d 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -1,11 +1,13 @@
package cc.mrbird.febs.mall.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @author wzy
@@ -55,5 +57,37 @@
private String remark;
+ /**
+ * 是否删除 1-是 2-否
+ */
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;
+ /**
+ * ALTER TABLE `mall_order_info`
+ * ADD COLUMN `comment_state` int(11) NULL COMMENT '评价状态 1：待评价 2：已评价' AFTER `carriage`;
+ */
+ private Integer commentState;
+ /**
+ * 评价状态 1：待评价 2：已评价
+ */
+ public static final Integer COMMENT_STATE_NO = 1;
+ public static final Integer COMMENT_STATE_YES = 2;
}
--
Gitblit v1.9.1