From f9df0d0d02a10034968ee174eedf2e46537a6fc1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Sep 2022 09:55:10 +0800
Subject: [PATCH] 20220822

---
 src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
index 125fb8d..41fa4ee 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.mall.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -63,7 +64,13 @@
     @ApiModelProperty(value = "剩余时间")
     private Long remainTime;
 
+    @ApiModelProperty(value = "运费")
+    private BigDecimal carriage;
+
     public Integer getPayMethodType() {
+        if (this.payMethod == null) {
+            return 0;
+        }
         switch (this.payMethod) {
             case "微信支付" :
                 return 1;
@@ -75,5 +82,38 @@
                 return 3;
         }
     }
+
+    @ApiModelProperty(value = "评价状态 1:待评价 2:已评价")
+    private Integer commentState;
+    //提货码
+    @ApiModelProperty(value = "提货码")
+    private String takeCode;
+    /**
+     * 自提点信息
+     */
+    @ApiModelProperty(value = "团长姓名")
+    private String leaderName;
+    @ApiModelProperty(value = "团长电话")
+    private String leaderPhone;
+    @ApiModelProperty(value = "自提点图片")
+    private String addressPic;
+    @ApiModelProperty(value = "自提点省")
+    private String province;
+    @ApiModelProperty(value = "自提点市")
+    private String city;
+    @ApiModelProperty(value = "自提点区")
+    private String township;
+    @ApiModelProperty(value = "自提点名称")
+    private String addressArea;
+    @ApiModelProperty(value = "自提点详细地址")
+    private String detailAddress;
+    @ApiModelProperty(value = "自提点经度")
+    private Double leaderLongitude;
+    @ApiModelProperty(value = "自提点纬度")
+    private Double leaderLatitude;
+    @ApiModelProperty(value = "配送状态 1:待配送 2:配送中 3:已送达")
+    private Integer deliveryState;
+    @ApiModelProperty(value = "是否送货上门  1:是 2:否")
+    private Integer isHome;
 }
 

--
Gitblit v1.9.1