From f90f24f12f331f491737492022c17dffb79ec505 Mon Sep 17 00:00:00 2001
From: lishouyi <linlangsur163@163.com>
Date: 星期四, 01 六月 2023 20:16:42 +0800
Subject: [PATCH] 管理后台：订单列表添加的地图优化
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java
index 06bd233..0303b36 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.math.BigDecimal;
import java.util.Date;
@@ -37,6 +38,14 @@
* 用户id
*/
private Integer userId;
+ /**
+ * 乘车人电话
+ */
+ private String userPhone;
+ /**
+ * 乘车人姓名
+ */
+ private String userName;
/**
* 司机id
*/
@@ -130,7 +139,16 @@
* 添加时间
*/
private Date createTime;
-
+ /**
+ * 预估里程
+ */
+ @TableField("estimatedMileage")
+ private Double estimatedMileage;
+ /**
+ * 预估时间
+ */
+ @TableField("estimatedTime")
+ private Integer estimatedTime;
/**
* 行程录音
*/
@@ -188,9 +206,34 @@
private BigDecimal discountAmount;
@ApiModelProperty(value = "实际里程（米）")
private Integer actualMileage;
-
+ /**
+ * 折扣0.01
+ */
+ @TableField("discount")
+ private Double discount;
@ApiModelProperty(value = "是否已开票 1是 0否")
private Integer isInvoice;
+ /**
+ * 大厅订单（0=否，1=是）
+ */
+ @TableField("hallOrder")
+ private Integer hallOrder;
+
+ public String getUserPhone() {
+ return userPhone;
+ }
+
+ public void setUserPhone(String userPhone) {
+ this.userPhone = userPhone;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
public Integer getIsInvoice() {
return isInvoice;
@@ -560,6 +603,38 @@
this.createTime = createTime;
}
+ public Double getEstimatedMileage() {
+ return estimatedMileage;
+ }
+
+ public void setEstimatedMileage(Double estimatedMileage) {
+ this.estimatedMileage = estimatedMileage;
+ }
+
+ public Integer getEstimatedTime() {
+ return estimatedTime;
+ }
+
+ public void setEstimatedTime(Integer estimatedTime) {
+ this.estimatedTime = estimatedTime;
+ }
+
+ public Double getDiscount() {
+ return discount;
+ }
+
+ public void setDiscount(Double discount) {
+ this.discount = discount;
+ }
+
+ public Integer getHallOrder() {
+ return hallOrder;
+ }
+
+ public void setHallOrder(Integer hallOrder) {
+ this.hallOrder = hallOrder;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1