From bc11d703dd68efb9fe068a42cc8252d1adc49d9c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 12 Aug 2023 17:42:59 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java
index 2c05da4..592fc0b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java
@@ -3,8 +3,10 @@
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 javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -27,7 +29,7 @@
//支付订单号
private String payOrderNo;
//支付结果 1-成功2-失败
- private String payResult;
+ private Integer payResult;
/**
* 状态;1-待支付2-已支付3-已取消
@@ -50,6 +52,17 @@
*/
private Integer orderType;
+ private Long addressId;
+
+ private Integer deliverType;
+ //发货状态：1：待发货2：已发货3：已签收
+ private Integer deliverState;
+ public static final Integer DELIVER_STATUS_WAIT = 1;
+ public static final Integer DELIVER_STATUS_DONE = 2;
+ public static final Integer DELIVER_STATUS_OVER = 3;
+ private String deliverName;
+ private String deliverCode;
+
@TableField(exist = false)
private String address;
--
Gitblit v1.9.1