From b85d1d0b0a33190fc820adf4af45f98499b274cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 05 八月 2025 22:46:57 +0800
Subject: [PATCH] 提交推送服务
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 189 ++++++++++++++++++++++++++++-------------------
1 files changed, 112 insertions(+), 77 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..03b1250 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
@@ -474,6 +474,8 @@
private String splitAllocation;
private Integer responsibilityType;
+
+ private Long promotionActivityId;
/**
* 中台行程id
*/
@@ -1271,81 +1273,114 @@
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;
+ }
+
+ @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