From e52227b01983146f2e3c81dc575141d8b9889497 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 10:16:30 +0800
Subject: [PATCH] 代码调整
---
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 154 ++++-----------------------------------------------
1 files changed, 13 insertions(+), 141 deletions(-)
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
index 3d7069b..086388e 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -223,9 +223,6 @@
*/
@TableField("roadTollMoney")
private Double roadTollMoney;
- //节假日费
- @TableField("holidayFee")
- private Double holidayFee;
/**
* 红包抵扣金额
*/
@@ -271,9 +268,6 @@
*/
@TableField("payMoney")
private Double payMoney;
- //感谢费
- @TableField("thankYouFee")
- private Double thankYouFee;
/**
* 是否是代下单（0：否，1：是）
*/
@@ -340,6 +334,11 @@
@TableField("orderSource")
private Integer orderSource;
/**
+ * 设备号
+ */
+ @TableField("deviceCode")
+ private String deviceCode;
+ /**
* 发票id
*/
@TableField("invoiceId")
@@ -384,125 +383,6 @@
*/
@TableField("bindId")
private String bindId;
-
- /**
- * 乘车人数
- */
- @TableField("peopleNum")
- private Integer peopleNum;
- /**
- * 乘车类型(1=独享，2=一口价，3=拼车)
- */
- @TableField("rideType")
- private Integer rideType;
-
- @TableField("pid")
- private Integer pid;
-
- private Integer totalPeopleNum;
-
- /**
- * 预估里程(米)
- */
- private Double estimateMileage;
-
- private Double estimateTime;
-
- private Integer spellSuccess;
-
- private String waitRule;
- private String chargeRule;
- private String chargeRules;
-
- private Integer driverCancle;
-
- public String getChargeRules() {
- return chargeRules;
- }
-
- public void setChargeRules(String chargeRules) {
- this.chargeRules = chargeRules;
- }
-
- public Integer getDriverCancle() {
- return driverCancle;
- }
-
- public void setDriverCancle(Integer driverCancle) {
- this.driverCancle = driverCancle;
- }
-
- public String getWaitRule() {
- return waitRule;
- }
-
- public void setWaitRule(String waitRule) {
- this.waitRule = waitRule;
- }
-
- public String getChargeRule() {
- return chargeRule;
- }
-
- public void setChargeRule(String chargeRule) {
- this.chargeRule = chargeRule;
- }
-
- public Integer getSpellSuccess() {
- return spellSuccess;
- }
-
- public void setSpellSuccess(Integer spellSuccess) {
- this.spellSuccess = spellSuccess;
- }
-
- public Double getEstimateTime() {
- return estimateTime;
- }
-
- public void setEstimateTime(Double estimateTime) {
- this.estimateTime = estimateTime;
- }
-
- public Double getEstimateMileage() {
- return estimateMileage;
- }
-
- public void setEstimateMileage(Double estimateMileage) {
- this.estimateMileage = estimateMileage;
- }
-
- public Integer getPeopleNum() {
- return peopleNum;
- }
-
- public void setPeopleNum(Integer peopleNum) {
- this.peopleNum = peopleNum;
- }
-
- public Integer getRideType() {
- return rideType;
- }
-
- public void setRideType(Integer rideType) {
- this.rideType = rideType;
- }
-
- public Integer getPid() {
- return pid;
- }
-
- public void setPid(Integer pid) {
- this.pid = pid;
- }
-
- public Integer getTotalPeopleNum() {
- return totalPeopleNum;
- }
-
- public void setTotalPeopleNum(Integer totalPeopleNum) {
- this.totalPeopleNum = totalPeopleNum;
- }
public Integer getId() {
return id;
@@ -792,14 +672,6 @@
this.roadTollMoney = roadTollMoney;
}
- public Double getHolidayFee() {
- return holidayFee;
- }
-
- public void setHolidayFee(Double holidayFee) {
- this.holidayFee = holidayFee;
- }
-
public Double getRedPacketMoney() {
return redPacketMoney;
}
@@ -870,14 +742,6 @@
public void setPayMoney(Double payMoney) {
this.payMoney = payMoney;
- }
-
- public Double getThankYouFee() {
- return thankYouFee;
- }
-
- public void setThankYouFee(Double thankYouFee) {
- this.thankYouFee = thankYouFee;
}
public Integer getSubstitute() {
@@ -1096,6 +960,14 @@
this.startMileage = startMileage;
}
+ public String getDeviceCode() {
+ return deviceCode;
+ }
+
+ public void setDeviceCode(String deviceCode) {
+ this.deviceCode = deviceCode;
+ }
+
@Override
public String toString() {
return "OrderPrivateCar{" +
--
Gitblit v1.7.1