From 363c0f2d5ac2cec13e28bcba4f46f272dff448dc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 28 Jul 2022 16:55:55 +0800
Subject: [PATCH] 20220727 保存代码
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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 2eedb6d..72b0f24 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;
@@ -80,14 +81,44 @@
private Integer orderType;
private BigDecimal carriage;
- /**
- * ALTER TABLE `mall_order_info`
- * ADD COLUMN `comment_state` int(11) NULL COMMENT '评价状态 1：待评价 2：已评价' AFTER `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;
+
+
+ /**
+ * 微信订单编号
+ */
+ private String wxOrderNo;
}
--
Gitblit v1.9.1