From 388d1eb5f87c50ede6b415950899fe8bb938ee28 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 八月 2025 15:05:41 +0800
Subject: [PATCH] 修改bug

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java |  226 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 147 insertions(+), 79 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 53e9b55..da72e33 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
@@ -437,7 +437,8 @@
 	@TableField("promotion")
 	private Integer promotion;
 	
-	
+
+	private Date successTime;
 	private String promotionUser;
 	
 	private String promotionPhone;
@@ -474,6 +475,8 @@
 	private String splitAllocation;
 	
 	private Integer responsibilityType;
+	
+	private Long promotionActivityId;
 	/**
 	 * 中台行程id
 	 */
@@ -486,7 +489,23 @@
 	 * 是否是追缴单（0=否，1=是）
 	 */
 	private Integer recoveryOrder;
-	
+	/**
+	 * 是否生成追缴单（0=否，1=是）
+	 */
+	private Integer isGenerateRecoveryOrder;
+	/**
+	 * 原始订单id
+	 */
+	private Integer oldOrderId;
+
+	public Date getSuccessTime() {
+		return successTime;
+	}
+
+	public void setSuccessTime(Date successTime) {
+		this.successTime = successTime;
+	}
+
 	public String getPromotionUser() {
 		return promotionUser;
 	}
@@ -1271,81 +1290,130 @@
 		this.recoveryOrder = recoveryOrder;
 	}
 	
-	@Override
-	public String toString() {
-		return "OrderPrivateCar{" +
-				"id=" + id +
-				", type=" + type +
-				", crossCityOrderId=" + crossCityOrderId +
-				", place=" + place +
-				", userId=" + userId +
-				", serverCarModelId=" + serverCarModelId +
-				", driverId=" + driverId +
-				", carId=" + carId +
-				", orderNum='" + orderNum + '\'' +
-				", placementLon=" + placementLon +
-				", placementLat=" + placementLat +
-				", placementAddress='" + placementAddress + '\'' +
-				", startLon=" + startLon +
-				", startLat=" + startLat +
-				", startAddress='" + startAddress + '\'' +
-				", endLon=" + endLon +
-				", endLat=" + endLat +
-				", endAddress='" + endAddress + '\'' +
-				", boardingLon=" + boardingLon +
-				", boardingLat=" + boardingLat +
-				", boardingAddress='" + boardingAddress + '\'' +
-				", boardingTime=" + boardingTime +
-				", getoffLon=" + getoffLon +
-				", getoffLat=" + getoffLat +
-				", getoffAddress='" + getoffAddress + '\'' +
-				", getoffTime=" + getoffTime +
-				", mileage=" + mileage +
-				", payManner=" + payManner +
-				", payType=" + payType +
-				", orderMoney=" + orderMoney +
-				", startMileage=" + startMileage +
-				", startMoney=" + startMoney +
-				", mileageKilometers=" + mileageKilometers +
-				", mileageMoney=" + mileageMoney +
-				", duration=" + duration +
-				", durationMoney=" + durationMoney +
-				", wait=" + wait +
-				", waitMoney=" + waitMoney +
-				", longDistance=" + longDistance +
-				", longDistanceMoney=" + longDistanceMoney +
-				", parkMoney=" + parkMoney +
-				", roadTollMoney=" + roadTollMoney +
-				", redPacketMoney=" + redPacketMoney +
-				", couponMoney=" + couponMoney +
-				", redPacketId=" + redPacketId +
-				", couponId=" + couponId +
-				", discount=" + discount +
-				", discountMoney=" + discountMoney +
-				", activityId=" + activityId +
-				", companyId=" + companyId +
-				", payMoney=" + payMoney +
-				", substitute=" + substitute +
-				", passengers='" + passengers + '\'' +
-				", passengersPhone='" + passengersPhone + '\'' +
-				", state=" + state +
-				", insertTime=" + insertTime +
-				", travelTime=" + travelTime +
-				", snatchOrderTime=" + snatchOrderTime +
-				", setOutTime=" + setOutTime +
-				", arriveTime=" + arriveTime +
-				", startServiceTime=" + startServiceTime +
-				", endServiceTime=" + endServiceTime +
-				", orderType=" + orderType +
-				", orderSource=" + orderSource +
-				", invoiceId=" + invoiceId +
-				", isReassign=" + isReassign +
-				", reassignNotice=" + reassignNotice +
-				", trackId='" + trackId + '\'' +
-				", isDelete=" + isDelete +
-				", oldState=" + oldState +
-				", telX='" + telX + '\'' +
-				", bindId='" + bindId + '\'' +
-				'}';
+	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;
+	}
+
+	@Override public String toString() {
+	return "OrderPrivateCar{" +
+			"id=" + id +
+			", type=" + type +
+			", crossCityOrderId=" + crossCityOrderId +
+			", place=" + place +
+			", userId=" + userId +
+			", serverCarModel='" + serverCarModel + '\'' +
+			", serverCarModelId=" + serverCarModelId +
+			", driverId=" + driverId +
+			", carId=" + carId +
+			", orderNum='" + orderNum + '\'' +
+			", placementLon=" + placementLon +
+			", placementLat=" + placementLat +
+			", placementAddress='" + placementAddress + '\'' +
+			", startLon=" + startLon +
+			", startLat=" + startLat +
+			", startAddress='" + startAddress + '\'' +
+			", endLon=" + endLon +
+			", endLat=" + endLat +
+			", endAddress='" + endAddress + '\'' +
+			", boardingLon=" + boardingLon +
+			", boardingLat=" + boardingLat +
+			", boardingAddress='" + boardingAddress + '\'' +
+			", boardingTime=" + boardingTime +
+			", getoffLon=" + getoffLon +
+			", getoffLat=" + getoffLat +
+			", getoffAddress='" + getoffAddress + '\'' +
+			", getoffTime=" + getoffTime +
+			", mileage=" + mileage +
+			", payManner=" + payManner +
+			", payType=" + payType +
+			", orderMoney=" + orderMoney +
+			", startMileage=" + startMileage +
+			", startMoney=" + startMoney +
+			", mileageKilometers=" + mileageKilometers +
+			", mileageMoney=" + mileageMoney +
+			", duration=" + duration +
+			", durationMoney=" + durationMoney +
+			", wait=" + wait +
+			", waitMoney=" + waitMoney +
+			", longDistance=" + longDistance +
+			", longDistanceMoney=" + longDistanceMoney +
+			", parkMoney=" + parkMoney +
+			", roadTollMoney=" + roadTollMoney +
+			", holidayFee=" + holidayFee +
+			", redPacketMoney=" + redPacketMoney +
+			", couponMoney=" + couponMoney +
+			", redPacketId=" + redPacketId +
+			", couponId=" + couponId +
+			", discount=" + discount +
+			", discountMoney=" + discountMoney +
+			", activityId=" + activityId +
+			", taxiCardId=" + taxiCardId +
+			", userTaxiCardId=" + userTaxiCardId +
+			", discountAmount=" + discountAmount +
+			", companyId=" + companyId +
+			", payMoney=" + payMoney +
+			", thankYouFee=" + thankYouFee +
+			", substitute=" + substitute +
+			", passengers='" + passengers + '\'' +
+			", passengersPhone='" + passengersPhone + '\'' +
+			", state=" + state +
+			", insertTime=" + insertTime +
+			", travelTime=" + travelTime +
+			", snatchOrderTime=" + snatchOrderTime +
+			", setOutTime=" + setOutTime +
+			", arriveTime=" + arriveTime +
+			", startServiceTime=" + startServiceTime +
+			", endServiceTime=" + endServiceTime +
+			", orderType=" + orderType +
+			", orderSource=" + orderSource +
+			", invoiceId=" + invoiceId +
+			", isReassign=" + isReassign +
+			", reassignNotice=" + reassignNotice +
+			", trackId='" + trackId + '\'' +
+			", isDelete=" + isDelete +
+			", 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