From 0481353111afb43a2322e18530dde26f1d841ead Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:15:34 +0800
Subject: [PATCH] 代码调整
---
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java | 355 ++++++++++++-----------------------------------------------
1 files changed, 72 insertions(+), 283 deletions(-)
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
index e0564a4..402391b 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
@@ -27,18 +27,6 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
- * 订单类型（1=普通订单，2=摆渡订单）
- */
- private Integer type;
- /**
- * 跨城订单id（摆渡专用）
- */
- private Integer crossCityOrderId;
- /**
- * 摆渡方位（1=跨城起点，2=跨城终点）
- */
- private Integer place;
- /**
* 用户id
*/
private Integer userId;
@@ -155,10 +143,6 @@
*/
private BigDecimal tipMoney;
/**
- * 节假费
- */
- private BigDecimal holidayFee;
- /**
* 红包抵扣金额
*/
private BigDecimal redPacketMoney;
@@ -175,30 +159,6 @@
*/
private Integer couponId;
/**
- * 折扣
- */
- private Double discount;
- /**
- * 折扣优惠金额
- */
- private Double discountMoney;
- /**
- * 折扣活动id
- */
- private Integer activityId;
- /**
- * 打车卡id
- */
- private Integer taxiCardId;
- /**
- * 打车卡记录id
- */
- private Integer userTaxiCardId;
- /**
- * 优惠金额
- */
- private Double discountAmount;
- /**
* 公司id
*/
private Integer companyId;
@@ -206,10 +166,6 @@
* 支付金额
*/
private BigDecimal payMoney;
- /**
- * 感谢费
- */
- private BigDecimal thankYouFee;
/**
* 是否是代下单（0：否，1：是）
*/
@@ -223,13 +179,13 @@
*/
private String passengersPhone;
/**
- * 备注
- */
- private String remark;
- /**
- * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付)
+ * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中)
*/
private Integer state;
+ /**
+ * 状态(改派前订单状态)
+ */
+ private Integer oldState;
/**
* 下单时间
*/
@@ -275,30 +231,25 @@
*/
private Integer isReassign;
/**
- * 改派通知（0=没有改派，1=改派中，2=已改派）
- */
- private Integer reassignNotice;
- /**
- * 高德猎鹰上的轨迹id
- */
- private String trackId;
- /**
* 是否删除 1=否 2=是
*/
private Integer isDelete;
- /**
- * 状态(改派前订单状态)
- */
- private Integer oldState;
- /**
- * 移动小号
- */
- private String telX;
- /**
- * 移动小号绑定关系id
- */
- private String bindId;
+ public Integer getOldState() {
+ return oldState;
+ }
+
+ public void setOldState(Integer oldState) {
+ this.oldState = oldState;
+ }
+
+ public Integer getIsDelete() {
+ return isDelete;
+ }
+
+ public void setIsDelete(Integer isDelete) {
+ this.isDelete = isDelete;
+ }
public Integer getId() {
return id;
@@ -306,30 +257,6 @@
public void setId(Integer id) {
this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getCrossCityOrderId() {
- return crossCityOrderId;
- }
-
- public void setCrossCityOrderId(Integer crossCityOrderId) {
- this.crossCityOrderId = crossCityOrderId;
- }
-
- public Integer getPlace() {
- return place;
- }
-
- public void setPlace(Integer place) {
- this.place = place;
}
public Integer getUserId() {
@@ -564,14 +491,6 @@
this.tipMoney = tipMoney;
}
- public BigDecimal getHolidayFee() {
- return holidayFee;
- }
-
- public void setHolidayFee(BigDecimal holidayFee) {
- this.holidayFee = holidayFee;
- }
-
public BigDecimal getRedPacketMoney() {
return redPacketMoney;
}
@@ -604,54 +523,6 @@
this.couponId = couponId;
}
- public Double getDiscount() {
- return discount;
- }
-
- public void setDiscount(Double discount) {
- this.discount = discount;
- }
-
- public Double getDiscountMoney() {
- return discountMoney;
- }
-
- public void setDiscountMoney(Double discountMoney) {
- this.discountMoney = discountMoney;
- }
-
- public Integer getActivityId() {
- return activityId;
- }
-
- public void setActivityId(Integer activityId) {
- this.activityId = activityId;
- }
-
- public Integer getTaxiCardId() {
- return taxiCardId;
- }
-
- public void setTaxiCardId(Integer taxiCardId) {
- this.taxiCardId = taxiCardId;
- }
-
- public Integer getUserTaxiCardId() {
- return userTaxiCardId;
- }
-
- public void setUserTaxiCardId(Integer userTaxiCardId) {
- this.userTaxiCardId = userTaxiCardId;
- }
-
- public Double getDiscountAmount() {
- return discountAmount;
- }
-
- public void setDiscountAmount(Double discountAmount) {
- this.discountAmount = discountAmount;
- }
-
public Integer getCompanyId() {
return companyId;
}
@@ -666,14 +537,6 @@
public void setPayMoney(BigDecimal payMoney) {
this.payMoney = payMoney;
- }
-
- public BigDecimal getThankYouFee() {
- return thankYouFee;
- }
-
- public void setThankYouFee(BigDecimal thankYouFee) {
- this.thankYouFee = thankYouFee;
}
public Integer getSubstitute() {
@@ -698,14 +561,6 @@
public void setPassengersPhone(String passengersPhone) {
this.passengersPhone = passengersPhone;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
}
public Integer getState() {
@@ -804,54 +659,6 @@
this.isReassign = isReassign;
}
- public Integer getReassignNotice() {
- return reassignNotice;
- }
-
- public void setReassignNotice(Integer reassignNotice) {
- this.reassignNotice = reassignNotice;
- }
-
- public String getTrackId() {
- return trackId;
- }
-
- public void setTrackId(String trackId) {
- this.trackId = trackId;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
-
- public Integer getOldState() {
- return oldState;
- }
-
- public void setOldState(Integer oldState) {
- this.oldState = oldState;
- }
-
- public String getTelX() {
- return telX;
- }
-
- public void setTelX(String telX) {
- this.telX = telX;
- }
-
- public String getBindId() {
- return bindId;
- }
-
- public void setBindId(String bindId) {
- this.bindId = bindId;
- }
-
@Override
protected Serializable pkVal() {
return this.id;
@@ -860,75 +667,57 @@
@Override
public String toString() {
return "TOrderTaxi{" +
- "id=" + id +
- ", type=" + type +
- ", crossCityOrderId=" + crossCityOrderId +
- ", place=" + place +
- ", userId=" + userId +
- ", driverId=" + driverId +
- ", carId=" + carId +
- ", orderNum=" + orderNum +
- ", placementLon=" + placementLon +
- ", placementLat=" + placementLat +
- ", placementAddress=" + placementAddress +
- ", startLon=" + startLon +
- ", startLat=" + startLat +
- ", endLon=" + endLon +
- ", startAddress=" + startAddress +
- ", endLat=" + endLat +
- ", endAddress=" + endAddress +
- ", boardingLon=" + boardingLon +
- ", boardingLat=" + boardingLat +
- ", boardingAddress=" + boardingAddress +
- ", boardingTime=" + boardingTime +
- ", getoffLon=" + getoffLon +
- ", getoffLat=" + getoffLat +
- ", getoffAddress=" + getoffAddress +
- ", getoffTime=" + getoffTime +
- ", mileage=" + mileage +
- ", payManner=" + payManner +
- ", payType=" + payType +
- ", orderMoney=" + orderMoney +
- ", travelMoney=" + travelMoney +
- ", parkMoney=" + parkMoney +
- ", roadTollMoney=" + roadTollMoney +
- ", tipMoney=" + tipMoney +
- ", holidayFee=" + holidayFee +
- ", redPacketMoney=" + redPacketMoney +
- ", couponMoney=" + couponMoney +
- ", redPacketId=" + redPacketId +
- ", couponId=" + couponId +
- ", discount=" + discount +
- ", discountMoney=" + discountMoney +
- ", activityId=" + activityId +
- ", taxiCardId=" + taxiCardId +
- ", userTaxiCardId=" + userTaxiCardId +
- ", discountAmount=" + discountAmount +
- ", companyId=" + companyId +
- ", payMoney=" + payMoney +
- ", thankYouFee=" + thankYouFee +
- ", substitute=" + substitute +
- ", passengers=" + passengers +
- ", passengersPhone=" + passengersPhone +
- ", remark=" + remark +
- ", state=" + state +
- ", insertTime=" + insertTime +
- ", travelTime=" + travelTime +
- ", snatchOrderTime=" + snatchOrderTime +
- ", setOutTime=" + setOutTime +
- ", arriveTime=" + arriveTime +
- ", startServiceTime=" + startServiceTime +
- ", endServiceTime=" + endServiceTime +
- ", orderType=" + orderType +
- ", orderSource=" + orderSource +
- ", invoiceId=" + invoiceId +
- ", isReassign=" + isReassign +
- ", reassignNotice=" + reassignNotice +
- ", trackId=" + trackId +
- ", isDelete=" + isDelete +
- ", oldState=" + oldState +
- ", telX=" + telX +
- ", bindId=" + bindId +
- "}";
+ "id=" + id +
+ ", userId=" + userId +
+ ", driverId=" + driverId +
+ ", carId=" + carId +
+ ", orderNum=" + orderNum +
+ ", placementLon=" + placementLon +
+ ", placementLat=" + placementLat +
+ ", placementAddress=" + placementAddress +
+ ", startLon=" + startLon +
+ ", startLat=" + startLat +
+ ", endLon=" + endLon +
+ ", startAddress=" + startAddress +
+ ", endLat=" + endLat +
+ ", endAddress=" + endAddress +
+ ", boardingLon=" + boardingLon +
+ ", boardingLat=" + boardingLat +
+ ", boardingAddress=" + boardingAddress +
+ ", boardingTime=" + boardingTime +
+ ", getoffLon=" + getoffLon +
+ ", getoffLat=" + getoffLat +
+ ", getoffAddress=" + getoffAddress +
+ ", getoffTime=" + getoffTime +
+ ", mileage=" + mileage +
+ ", payManner=" + payManner +
+ ", payType=" + payType +
+ ", orderMoney=" + orderMoney +
+ ", travelMoney=" + travelMoney +
+ ", parkMoney=" + parkMoney +
+ ", roadTollMoney=" + roadTollMoney +
+ ", tipMoney=" + tipMoney +
+ ", redPacketMoney=" + redPacketMoney +
+ ", couponMoney=" + couponMoney +
+ ", redPacketId=" + redPacketId +
+ ", couponId=" + couponId +
+ ", companyId=" + companyId +
+ ", payMoney=" + payMoney +
+ ", substitute=" + substitute +
+ ", passengers=" + passengers +
+ ", passengersPhone=" + passengersPhone +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ ", travelTime=" + travelTime +
+ ", snatchOrderTime=" + snatchOrderTime +
+ ", setOutTime=" + setOutTime +
+ ", arriveTime=" + arriveTime +
+ ", startServiceTime=" + startServiceTime +
+ ", endServiceTime=" + endServiceTime +
+ ", orderType=" + orderType +
+ ", orderSource=" + orderSource +
+ ", invoiceId=" + invoiceId +
+ ", isReassign=" + isReassign +
+ "}";
}
}
--
Gitblit v1.7.1