From cf0f93a4c122121b205ab52bb5fc3b3b93682670 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 16:19:57 +0800
Subject: [PATCH] 20220902

---
 src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java |   65 ++++++++++++++++++++++++++++++++
 1 files changed, 65 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 2503623..cb4a69a 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;
@@ -69,4 +70,68 @@
 
     @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;
+
+    //提货团长特征码
+    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