From 75a2623173bcc4a235aa1f99f7ef28519186160b Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:24:25 +0800
Subject: [PATCH] 代码调整
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 142 -----------------------------------------------
1 files changed, 1 insertions(+), 141 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
index 9d39ed1..3aac707 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
+++ b/UserTravel/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;
/**
* 红包抵扣金额
*/
@@ -262,21 +259,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")
@@ -286,9 +268,6 @@
*/
@TableField("payMoney")
private Double payMoney;
- //感谢费
- @TableField("thankYouFee")
- private Double thankYouFee;
/**
* 是否是代下单（0：否，1：是）
*/
@@ -350,7 +329,7 @@
@TableField("orderType")
private Integer orderType;
/**
- * 订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单)
+ * 订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单，6：智慧屏)
*/
@TableField("orderSource")
private Integer orderSource;
@@ -399,85 +378,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;
-
- 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 getTotalPeopleNum() {
- return totalPeopleNum;
- }
-
- public void setTotalPeopleNum(Integer totalPeopleNum) {
- this.totalPeopleNum = totalPeopleNum;
- }
-
- public Integer getPid() {
- return pid;
- }
-
- public void setPid(Integer pid) {
- this.pid = pid;
- }
-
- 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 getId() {
return id;
@@ -815,14 +715,6 @@
this.roadTollMoney = roadTollMoney;
}
- public Double getHolidayFee() {
- return holidayFee;
- }
-
- public void setHolidayFee(Double holidayFee) {
- this.holidayFee = holidayFee;
- }
-
public Double getRedPacketMoney() {
return redPacketMoney;
}
@@ -879,30 +771,6 @@
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;
}
@@ -917,14 +785,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() {
--
Gitblit v1.7.1