From f24069e2f98fcb1a2bcdfc295288eb8558b302e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Aug 2023 15:32:04 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 0eb715e..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;
@@ -26,13 +28,17 @@
private String payMethod;
//支付订单号
private String payOrderNo;
- //支付结果 1-成功2-未成功
- private String payResult;
+ //支付结果 1-成功2-失败
+ private Integer payResult;
/**
* 状态;1-待支付2-已支付3-已取消
*/
private Integer status;
+
+ public static final Integer STATUS_WAIT = 1;
+ public static final Integer STATUS_PAY = 2;
+ public static final Integer STATUS_CANCEL = 3;
/**
* 取消类型;1-超时未支付2-主动取消
@@ -46,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