From 595b2b00b7bff045b21bd830004e3a00b2c8ee03 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 16 May 2022 10:52:26 +0800
Subject: [PATCH] complete news
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 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 8d9fc8b..777df59 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
@@ -27,6 +29,10 @@
private String payMethod;
+ private String payOrderNo;
+
+ private String payResult;
+
/**
* 状态 1-待支付2-待发货3-待收货4-已完成5-退款中6-已退款7-已取消
*/
@@ -36,6 +42,8 @@
* 取消类型 1-超时未支付2-主动取消
*/
private Integer cancelType;
+ public static final Integer CANCEL_OVERTIME_NO_PAY = 1;
+ public static final Integer CANCEL_BY_SELF = 2;
private String name;
@@ -46,4 +54,28 @@
private String longitude;
private String latitude;
+
+ 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;
}
--
Gitblit v1.9.1