From 30b46ac738af05a4012cd2b841ee881f2c28f679 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 14:46:02 +0800
Subject: [PATCH] 代码调整
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java | 74 ++++++------------------------------
1 files changed, 13 insertions(+), 61 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
index fa63bd8..8bedbe6 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
@@ -179,9 +179,6 @@
*/
@TableField("tipMoney")
private Double tipMoney;
- //节假费
- @TableField("holidayFee")
- private Double holidayFee;
/**
* 红包抵扣金额
*/
@@ -218,21 +215,6 @@
@TableField("activityId")
private Integer activityId;
/**
- * 打折卡id
- */
- @TableField("taxiCardId")
- private Integer taxiCardId;
- /**
- * 打车卡记录id
- */
- @TableField("userTaxiCardId")
- private Integer userTaxiCardId;
- /**
- * 优惠金额
- */
- @TableField("discountAmount")
- private Double discountAmount;
- /**
* 公司id
*/
@TableField("companyId")
@@ -242,9 +224,6 @@
*/
@TableField("payMoney")
private Double payMoney;
- //感谢费
- @TableField("thankYouFee")
- private Double thankYouFee;
/**
* 是否是代下单（0：否，1：是）
*/
@@ -332,6 +311,11 @@
*/
@TableField("trackId")
private String trackId;
+ /**
+ * 设备号
+ */
+ @TableField("deviceCode")
+ private String deviceCode;
/**
* 是否删除（1=否，2=是）
*/
@@ -612,14 +596,6 @@
this.tipMoney = tipMoney;
}
- public Double getHolidayFee() {
- return holidayFee;
- }
-
- public void setHolidayFee(Double holidayFee) {
- this.holidayFee = holidayFee;
- }
-
public Double getRedPacketMoney() {
return redPacketMoney;
}
@@ -652,30 +628,6 @@
this.couponId = couponId;
}
- 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;
}
@@ -690,14 +642,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() {
@@ -901,6 +845,14 @@
this.bindId = bindId;
}
+ public String getDeviceCode() {
+ return deviceCode;
+ }
+
+ public void setDeviceCode(String deviceCode) {
+ this.deviceCode = deviceCode;
+ }
+
@Override
public String toString() {
return "OrderTaxi{" +
--
Gitblit v1.7.1