From dfb1f5ab2e8dc03cf2f497ce3327f6ce58700766 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 11:35:55 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 201 insertions(+), 2 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
index 7d3a614..a3bb5ef 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -367,6 +367,7 @@
private Integer invoiceId;
/**
* 是否是改派单（1=否，=是）
+ *
* @return
*/
@TableField("isReassign")
@@ -378,6 +379,7 @@
private Integer reassignNotice;
/**
* 高德猎鹰轨迹id
+ *
* @return
*/
@TableField("trackId")
@@ -389,18 +391,21 @@
private Integer isDelete;
/**
* 该派前的订单状态
+ *
* @return
*/
@TableField("oldState")
private Integer oldState;
/**
* 移动小号
+ *
* @return
*/
@TableField("telX")
private String telX;
/**
* 绑定小号关系id
+ *
* @return
*/
@TableField("bindId")
@@ -426,13 +431,17 @@
private Integer abnormal;
-
/**
* 推广订单 1否 2是
*/
@TableField("promotion")
private Integer promotion;
+
+ private Date successTime;
+ private String promotionUser;
+
+ private String promotionPhone;
/**
@@ -453,7 +462,6 @@
private BigDecimal promotionMoney;
-
private Integer totalPeopleNum;
/**
* 预估里程(米)
@@ -467,6 +475,66 @@
private String splitAllocation;
private Integer responsibilityType;
+
+ private Long promotionActivityId;
+ /**
+ * 中台行程id
+ */
+ private String travelId;
+ /**
+ * 中台是否已创建订单（0=否，1=是）
+ */
+ private Integer isCreated;
+ /**
+ * 是否是追缴单（0=否，1=是）
+ */
+ private Integer recoveryOrder;
+ /**
+ * 是否生成追缴单（0=否，1=是）
+ */
+ private Integer isGenerateRecoveryOrder;
+ /**
+ * 原始订单id
+ */
+ private Integer oldOrderId;
+
+ private Integer abnormalStatus;
+
+ private String abnormalRemark;
+
+ private BigDecimal responsibilityMoney;
+
+ private String voice;
+
+ private Date voiceTime;
+
+ private Date recoveryOrderCreateDate;
+
+ private Date payTime;
+
+ public Date getSuccessTime() {
+ return successTime;
+ }
+
+ public void setSuccessTime(Date successTime) {
+ this.successTime = successTime;
+ }
+
+ public String getPromotionUser() {
+ return promotionUser;
+ }
+
+ public void setPromotionUser(String promotionUser) {
+ this.promotionUser = promotionUser;
+ }
+
+ public String getPromotionPhone() {
+ return promotionPhone;
+ }
+
+ public void setPromotionPhone(String promotionPhone) {
+ this.promotionPhone = promotionPhone;
+ }
public Integer getResponsibilityType() {
return responsibilityType;
@@ -1212,6 +1280,110 @@
this.splitAllocation = splitAllocation;
}
+ public String getTravelId() {
+ return travelId;
+ }
+
+ public void setTravelId(String travelId) {
+ this.travelId = travelId;
+ }
+
+ public Integer getIsCreated() {
+ return isCreated;
+ }
+
+ public void setIsCreated(Integer isCreated) {
+ this.isCreated = isCreated;
+ }
+
+ public Integer getRecoveryOrder() {
+ return recoveryOrder;
+ }
+
+ public void setRecoveryOrder(Integer recoveryOrder) {
+ this.recoveryOrder = recoveryOrder;
+ }
+
+ public Long getPromotionActivityId() {
+ return promotionActivityId;
+ }
+
+ public void setPromotionActivityId(Long promotionActivityId) {
+ this.promotionActivityId = promotionActivityId;
+ }
+
+ public Integer getIsGenerateRecoveryOrder() {
+ return isGenerateRecoveryOrder;
+ }
+
+ public void setIsGenerateRecoveryOrder(Integer isGenerateRecoveryOrder) {
+ this.isGenerateRecoveryOrder = isGenerateRecoveryOrder;
+ }
+
+ public Integer getOldOrderId() {
+ return oldOrderId;
+ }
+
+ public void setOldOrderId(Integer oldOrderId) {
+ this.oldOrderId = oldOrderId;
+ }
+
+ public Integer getAbnormalStatus() {
+ return abnormalStatus;
+ }
+
+ public void setAbnormalStatus(Integer abnormalStatus) {
+ this.abnormalStatus = abnormalStatus;
+ }
+
+ public BigDecimal getResponsibilityMoney() {
+ return responsibilityMoney;
+ }
+
+ public void setResponsibilityMoney(BigDecimal responsibilityMoney) {
+ this.responsibilityMoney = responsibilityMoney;
+ }
+
+ public String getVoice() {
+ return voice;
+ }
+
+ public void setVoice(String voice) {
+ this.voice = voice;
+ }
+
+ public Date getVoiceTime() {
+ return voiceTime;
+ }
+
+ public void setVoiceTime(Date voiceTime) {
+ this.voiceTime = voiceTime;
+ }
+
+ public Date getRecoveryOrderCreateDate() {
+ return recoveryOrderCreateDate;
+ }
+
+ public void setRecoveryOrderCreateDate(Date recoveryOrderCreateDate) {
+ this.recoveryOrderCreateDate = recoveryOrderCreateDate;
+ }
+
+ public Date getPayTime() {
+ return payTime;
+ }
+
+ public void setPayTime(Date payTime) {
+ this.payTime = payTime;
+ }
+
+ public String getAbnormalRemark() {
+ return abnormalRemark;
+ }
+
+ public void setAbnormalRemark(String abnormalRemark) {
+ this.abnormalRemark = abnormalRemark;
+ }
+
@Override
public String toString() {
return "OrderPrivateCar{" +
@@ -1220,6 +1392,7 @@
", crossCityOrderId=" + crossCityOrderId +
", place=" + place +
", userId=" + userId +
+ ", serverCarModel='" + serverCarModel + '\'' +
", serverCarModelId=" + serverCarModelId +
", driverId=" + driverId +
", carId=" + carId +
@@ -1257,6 +1430,7 @@
", longDistanceMoney=" + longDistanceMoney +
", parkMoney=" + parkMoney +
", roadTollMoney=" + roadTollMoney +
+ ", holidayFee=" + holidayFee +
", redPacketMoney=" + redPacketMoney +
", couponMoney=" + couponMoney +
", redPacketId=" + redPacketId +
@@ -1264,8 +1438,12 @@
", discount=" + discount +
", discountMoney=" + discountMoney +
", activityId=" + activityId +
+ ", taxiCardId=" + taxiCardId +
+ ", userTaxiCardId=" + userTaxiCardId +
+ ", discountAmount=" + discountAmount +
", companyId=" + companyId +
", payMoney=" + payMoney +
+ ", thankYouFee=" + thankYouFee +
", substitute=" + substitute +
", passengers='" + passengers + '\'' +
", passengersPhone='" + passengersPhone + '\'' +
@@ -1287,6 +1465,27 @@
", oldState=" + oldState +
", telX='" + telX + '\'' +
", bindId='" + bindId + '\'' +
+ ", peopleNum=" + peopleNum +
+ ", rideType=" + rideType +
+ ", pid=" + pid +
+ ", abnormal=" + abnormal +
+ ", promotion=" + promotion +
+ ", promotionUser='" + promotionUser + '\'' +
+ ", promotionPhone='" + promotionPhone + '\'' +
+ ", abnormalIntro='" + abnormalIntro + '\'' +
+ ", abnormalImg='" + abnormalImg + '\'' +
+ ", promotionDriverId=" + promotionDriverId +
+ ", promotionMoney=" + promotionMoney +
+ ", totalPeopleNum=" + totalPeopleNum +
+ ", estimateMileage=" + estimateMileage +
+ ", estimateTime=" + estimateTime +
+ ", spellSuccess=" + spellSuccess +
+ ", splitAllocation='" + splitAllocation + '\'' +
+ ", responsibilityType=" + responsibilityType +
+ ", promotionActivityId=" + promotionActivityId +
+ ", travelId='" + travelId + '\'' +
+ ", isCreated=" + isCreated +
+ ", recoveryOrder=" + recoveryOrder +
'}';
}
}
--
Gitblit v1.7.1