From b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 二月 2023 10:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 178 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..4825eed 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,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
+
import java.io.Serializable;
/**
@@ -115,7 +117,7 @@
*/
private Date payTime;
/**
- * 订单状态（1=待接单，2=已接单，3=）
+ * 订单状态（订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待评价，108=已完成，201=转单中，301=已取消））
*/
private Integer state;
/**
@@ -127,6 +129,181 @@
*/
private Date createTime;
+ @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;
+
+ 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;
--
Gitblit v1.7.1