From 029831451b29a13fe9c42164d5a7b7f9032b6188 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Mar 2023 11:45:22 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 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..8e06c2f 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,14 @@
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @author wzy
@@ -55,5 +58,41 @@
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;
+
+ 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;
+ //补贴金额
+ private BigDecimal subsidyAmount;
}
--
Gitblit v1.9.1