From 1fc5510367dcf321ac85e50e31c9dcdaaf5cd09e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 11:56:27 +0800
Subject: [PATCH] 20221221

---
 src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java |   13 +++++++++----
 1 files changed, 9 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..8e06c2f 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,18 @@
     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;
+
+    //配送方式 1:快递寄送2:到店自提
+    private Integer deliverType;
+
+    private Long shopId;
+    //补贴金额
+    private BigDecimal subsidyAmount;
 }

--
Gitblit v1.9.1