From b2100bd0dd320e1a6e63c20d0b4bd46a6a333504 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 20 May 2022 11:19:11 +0800 Subject: [PATCH] 20220518 --- src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 22 ++++++++++++++++++++++ 1 files changed, 22 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..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 @@ -55,5 +57,25 @@ 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