From f61293e97bb2cb21c8f49e88b1ae5a3cbadefb6a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 25 Dec 2023 16:40:09 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 1 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 2dc801e..a3ec9a6 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -3,6 +3,7 @@
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;
@@ -31,12 +32,13 @@
private String payOrderNo;
- private String payResult;
+ private Integer payResult;
/**
* 状态 1-待支付2-待发货3-待收货4-已完成5-退款中6-已退款7-已取消
*/
private Integer status;
+ private Integer isApp;
/**
* 取消类型 1-超时未支付2-主动取消
@@ -49,6 +51,7 @@
private String phone;
+ private Long addressId;
private String address;
private String longitude;
@@ -73,4 +76,64 @@
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;
+
+ //提货团长特征码
+ private String takeUniqueCode;
+ //提货码
+ private String takeCode;
+ //配送方式 1：自提 2：快递
+ private Integer deliveryType;
+
+ /**
+ * 自提点信息
+ */
+ @TableField(exist = false)
+ private String leaderName;
+ @TableField(exist = false)
+ private String leaderPhone;
+ @TableField(exist = false)
+ private String addressPic;
+ @TableField(exist = false)
+ private String province;
+ @TableField(exist = false)
+ private String city;
+ @TableField(exist = false)
+ private String township;
+ @TableField(exist = false)
+ private String addressArea;
+ @TableField(exist = false)
+ private String detailAddress;
+ @TableField(exist = false)
+ private Double leaderLongitude;
+ @TableField(exist = false)
+ private Double leaderLatitude;
+ /**
+ * 微信订单编号
+ */
+ private String wxOrderNo;
+ /**
+ * 配送状态 1：待配送 2：配送中 3：已送达
+ */
+ private Integer deliveryState;
+ /**
+ * 是否送货上门 1：是 2：否
+ */
+ private Integer isHome;
+
+ @TableField(exist = false)
+ private String orderIds;
}
--
Gitblit v1.9.1