From f72ae151cc12b219cb5f39eea3ec0ea089a6ef2a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 八月 2025 23:53:05 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java | 152 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 129 insertions(+), 23 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
index 2e10d90..53ab1b8 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
@@ -317,6 +317,7 @@
private Integer invoiceId;
/**
* 是否是改派单（1=否，=是）
+ *
* @return
*/
@TableField("isReassign")
@@ -328,6 +329,7 @@
private Integer reassignNotice;
/**
* 高德猎鹰轨迹id
+ *
* @return
*/
@TableField("trackId")
@@ -339,18 +341,21 @@
private Integer isDelete;
/**
* 该派前的订单状态
+ *
* @return
*/
@TableField("oldState")
private Integer oldState;
/**
* 移动小号
+ *
* @return
*/
@TableField("telX")
private String telX;
/**
* 绑定小号关系id
+ *
* @return
*/
@TableField("bindId")
@@ -361,6 +366,8 @@
*/
@TableField("abnormal")
private Integer abnormal;
+
+ private Date successTime;
/**
@@ -384,24 +391,67 @@
private String splitAllocation;
private Integer responsibilityType;
-
-
+
+
private Integer promotion;
-
+
private String voice;
-
-
+
+
private Date voiceTime;
-
+
private String promotionUser;
-
+
private String promotionPhone;
-
+
+ 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 BigDecimal responsibilityMoney;
+
+ private Date recoveryOrderCreateDate;
+
+ private Date payTime;
+
+
+ public Date getSuccessTime() {
+ return successTime;
+ }
+
+ public void setSuccessTime(Date successTime) {
+ this.successTime = successTime;
+ }
+
+ public Long getPromotionActivityId() {
+ return promotionActivityId;
+ }
+
+ public void setPromotionActivityId(Long promotionActivityId) {
+ this.promotionActivityId = promotionActivityId;
+ }
+
public Integer getResponsibilityType() {
return responsibilityType;
@@ -1003,63 +1053,119 @@
public void setSplitAllocation(String splitAllocation) {
this.splitAllocation = splitAllocation;
}
-
+
public Integer getPromotion() {
return promotion;
}
-
+
public void setPromotion(Integer promotion) {
this.promotion = promotion;
}
-
+
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 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 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 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 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;
+ }
+
@Override
public String toString() {
return "OrderTaxi{" +
--
Gitblit v1.7.1