From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java | 320 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 319 insertions(+), 1 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 cc84797..b70d2df 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
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
/**
@@ -53,6 +56,7 @@
/**
* 开始服务时间
*/
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 起点地址
@@ -87,6 +91,30 @@
*/
private Date getoffTime;
/**
+ * 上车地址
+ */
+ private String boardingAddress;
+ /**
+ * 上车经度
+ */
+ private String boardingLng;
+ /**
+ * 上车纬度
+ */
+ private String boardingLat;
+ /**
+ * 下车地址
+ */
+ private String debusAddress;
+ /**
+ * 下车经度
+ */
+ private String debusLng;
+ /**
+ * 下车纬度
+ */
+ private String debusLat;
+ /**
* 预估价
*/
private BigDecimal estimatedPrice;
@@ -115,7 +143,7 @@
*/
private Date payTime;
/**
- * 订单状态（1=待接单，2=已接单，3=）
+ * 订单状态（订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待评价，108=已完成，201=转单中，301=已取消））
*/
private Integer state;
/**
@@ -127,6 +155,248 @@
*/
private Date createTime;
+ /**
+ * 行程录音
+ */
+ private String routeRecord;
+
+ @ApiModelProperty(value = "起步里程（公里）")
+ private Double startDistance;
+
+ @ApiModelProperty(value = "起步价")
+ private BigDecimal startPrice;
+
+ @ApiModelProperty(value = "超出起步里程")
+ private Double overDriveDistance;
+
+ @ApiModelProperty(value = "超出起步里程费")
+ private BigDecimal overDrivePrice;
+
+ @ApiModelProperty(value = "长途里程")
+ private String longDistance;
+
+ @ApiModelProperty(value = "长途里程费")
+ private BigDecimal longDistancePrice;
+
+ @ApiModelProperty(value = "超出长途里程")
+ private Double overLongDistance;
+
+ @ApiModelProperty(value = "超出长途里程费")
+ private BigDecimal overLongDistancePrice;
+
+ @ApiModelProperty(value = "等待时长（分钟）")
+ private Integer waitTime;
+
+ @ApiModelProperty(value = "等待费")
+ private BigDecimal waitTimePrice;
+
+ @ApiModelProperty(value = "超出等待时长（分钟）")
+ private Integer outWaitTime;
+
+ @ApiModelProperty(value = "超出等待费")
+ private BigDecimal outWaitTimePrice;
+
+ @ApiModelProperty(value = "恶劣天气里程")
+ private BigDecimal badWeatherDistance;
+
+ @ApiModelProperty(value = "恶劣天气费")
+ private BigDecimal badWeatherPrice;
+
+ @ApiModelProperty(value = "恶劣天气超出里程")
+ private Double overBadWeatherDistance;
+
+ @ApiModelProperty(value = "恶劣天气超出费")
+ private BigDecimal overBadWeatherPrice;
+
+ @ApiModelProperty(value = "折扣优惠金额")
+ private BigDecimal discountAmount;
+ @ApiModelProperty(value = "实际里程（米）")
+ private Integer actualMileage;
+
+ @ApiModelProperty(value = "是否已开票 1是 0否")
+ private Integer isInvoice;
+
+ @ApiModelProperty(value = "用户手机号")
+ private String userPhone;
+
+ @ApiModelProperty(value = "用户姓名")
+ private String userName;
+
+ 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;
+ }
+
+ public void setIsInvoice(Integer isInvoice) {
+ this.isInvoice = isInvoice;
+ }
+
+ public Integer getActualMileage() {
+ return actualMileage;
+ }
+
+ public void setActualMileage(Integer actualMileage) {
+ this.actualMileage = actualMileage;
+ }
+
+ public String getRouteRecord() {
+ return routeRecord;
+ }
+
+ public void setRouteRecord(String routeRecord) {
+ this.routeRecord = routeRecord;
+ }
+
+ public BigDecimal getDiscountAmount() {
+ return discountAmount;
+ }
+
+ public void setDiscountAmount(BigDecimal discountAmount) {
+ this.discountAmount = discountAmount;
+ }
+
+ public Double getStartDistance() {
+ return startDistance;
+ }
+
+ public void setStartDistance(Double startDistance) {
+ this.startDistance = startDistance;
+ }
+
+ public BigDecimal getStartPrice() {
+ return startPrice;
+ }
+
+ public void setStartPrice(BigDecimal startPrice) {
+ this.startPrice = startPrice;
+ }
+
+ public Double getOverDriveDistance() {
+ return overDriveDistance;
+ }
+
+ public void setOverDriveDistance(Double overDriveDistance) {
+ this.overDriveDistance = overDriveDistance;
+ }
+
+ public BigDecimal getOverDrivePrice() {
+ return overDrivePrice;
+ }
+
+ public void setOverDrivePrice(BigDecimal overDrivePrice) {
+ this.overDrivePrice = overDrivePrice;
+ }
+
+ public String getLongDistance() {
+ return longDistance;
+ }
+
+ public void setLongDistance(String longDistance) {
+ this.longDistance = longDistance;
+ }
+
+ public BigDecimal getLongDistancePrice() {
+ return longDistancePrice;
+ }
+
+ public void setLongDistancePrice(BigDecimal longDistancePrice) {
+ this.longDistancePrice = longDistancePrice;
+ }
+
+ public Double getOverLongDistance() {
+ return overLongDistance;
+ }
+
+ public void setOverLongDistance(Double overLongDistance) {
+ this.overLongDistance = overLongDistance;
+ }
+
+ public BigDecimal getOverLongDistancePrice() {
+ return overLongDistancePrice;
+ }
+
+ public void setOverLongDistancePrice(BigDecimal overLongDistancePrice) {
+ this.overLongDistancePrice = overLongDistancePrice;
+ }
+
+ public Integer getWaitTime() {
+ return waitTime;
+ }
+
+ public void setWaitTime(Integer waitTime) {
+ this.waitTime = waitTime;
+ }
+
+ public BigDecimal getWaitTimePrice() {
+ return waitTimePrice;
+ }
+
+ public void setWaitTimePrice(BigDecimal waitTimePrice) {
+ this.waitTimePrice = waitTimePrice;
+ }
+
+ public Integer getOutWaitTime() {
+ return outWaitTime;
+ }
+
+ public void setOutWaitTime(Integer outWaitTime) {
+ this.outWaitTime = outWaitTime;
+ }
+
+ public BigDecimal getOutWaitTimePrice() {
+ return outWaitTimePrice;
+ }
+
+ public void setOutWaitTimePrice(BigDecimal outWaitTimePrice) {
+ this.outWaitTimePrice = outWaitTimePrice;
+ }
+
+ public BigDecimal getBadWeatherDistance() {
+ return badWeatherDistance;
+ }
+
+ public void setBadWeatherDistance(BigDecimal badWeatherDistance) {
+ this.badWeatherDistance = badWeatherDistance;
+ }
+
+ public BigDecimal getBadWeatherPrice() {
+ return badWeatherPrice;
+ }
+
+ public void setBadWeatherPrice(BigDecimal badWeatherPrice) {
+ this.badWeatherPrice = badWeatherPrice;
+ }
+
+ public Double getOverBadWeatherDistance() {
+ return overBadWeatherDistance;
+ }
+
+ public void setOverBadWeatherDistance(Double overBadWeatherDistance) {
+ this.overBadWeatherDistance = overBadWeatherDistance;
+ }
+
+ public BigDecimal getOverBadWeatherPrice() {
+ return overBadWeatherPrice;
+ }
+
+ public void setOverBadWeatherPrice(BigDecimal overBadWeatherPrice) {
+ this.overBadWeatherPrice = overBadWeatherPrice;
+ }
public Integer getId() {
return id;
@@ -264,6 +534,54 @@
this.estimatedPrice = estimatedPrice;
}
+ public String getBoardingAddress() {
+ return boardingAddress;
+ }
+
+ public void setBoardingAddress(String boardingAddress) {
+ this.boardingAddress = boardingAddress;
+ }
+
+ public String getBoardingLng() {
+ return boardingLng;
+ }
+
+ public void setBoardingLng(String boardingLng) {
+ this.boardingLng = boardingLng;
+ }
+
+ public String getBoardingLat() {
+ return boardingLat;
+ }
+
+ public void setBoardingLat(String boardingLat) {
+ this.boardingLat = boardingLat;
+ }
+
+ public String getDebusAddress() {
+ return debusAddress;
+ }
+
+ public void setDebusAddress(String debusAddress) {
+ this.debusAddress = debusAddress;
+ }
+
+ public String getDebusLng() {
+ return debusLng;
+ }
+
+ public void setDebusLng(String debusLng) {
+ this.debusLng = debusLng;
+ }
+
+ public String getDebusLat() {
+ return debusLat;
+ }
+
+ public void setDebusLat(String debusLat) {
+ this.debusLat = debusLat;
+ }
+
public BigDecimal getOrderMoney() {
return orderMoney;
}
--
Gitblit v1.7.1