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/specialTrain/model/OrderPrivateCar.java | 2851 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1,461 insertions(+), 1,390 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 4f0c26b..a7fd844 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
@@ -13,1398 +13,1469 @@
  */
 @TableName("t_order_private_car")
 public class OrderPrivateCar {
-	/**
-	 * 主键
-	 */
-	@TableId(value = "id", type = IdType.AUTO)
-	@TableField("id")
-	private Integer id;
-	/**
-	 * 订单类型(1=普通订单,2=摆渡订单)
-	 */
-	@TableField("type")
-	private Integer type;
-	/**
-	 * 跨城订单id(摆渡车专用)
-	 */
-	@TableField("crossCityOrderId")
-	private Integer crossCityOrderId;
-	/**
-	 * 摆渡方位(1=跨城起点,2=跨城终点)
-	 */
-	@TableField("place")
-	private Integer place;
-	/**
-	 * 用户id
-	 */
-	@TableField("userId")
-	private Integer userId;
-	/**
-	 * 服务车型
-	 */
-	@TableField("serverCarModel")
-	private String serverCarModel;
-	/**
-	 * 服务车型id
-	 */
-	@TableField("serverCarModelId")
-	private Integer serverCarModelId;
-	/**
-	 * 司机id
-	 */
-	@TableField("driverId")
-	private Integer driverId;
-	/**
-	 * 车辆id
-	 */
-	@TableField("carId")
-	private Integer carId;
-	/**
-	 * 订单号
-	 */
-	@TableField("orderNum")
-	private String orderNum;
-	/**
-	 * 下单地点经度
-	 */
-	@TableField("placementLon")
-	private Double placementLon;
-	/**
-	 * 下单地点纬度
-	 */
-	@TableField("placementLat")
-	private Double placementLat;
-	/**
-	 * 下单地点
-	 */
-	@TableField("placementAddress")
-	private String placementAddress;
-	/**
-	 * 起点经度
-	 */
-	@TableField("startLon")
-	private Double startLon;
-	/**
-	 * 起点纬度
-	 */
-	@TableField("startLat")
-	private Double startLat;
-	/**
-	 * 起点
-	 */
-	@TableField("startAddress")
-	private String startAddress;
-	/**
-	 * 目的地经度
-	 */
-	@TableField("endLon")
-	private Double endLon;
-	/**
-	 * 目的地纬度
-	 */
-	@TableField("endLat")
-	private Double endLat;
-	/**
-	 * 目的地
-	 */
-	@TableField("endAddress")
-	private String endAddress;
-	/**
-	 * 上车点经度
-	 */
-	@TableField("boardingLon")
-	private Double boardingLon;
-	/**
-	 * 上车点纬度
-	 */
-	@TableField("boardingLat")
-	private Double boardingLat;
-	/**
-	 * 上车地点
-	 */
-	@TableField("boardingAddress")
-	private String boardingAddress;
-	/**
-	 * 上车时间
-	 */
-	@TableField("boardingTime")
-	private Date boardingTime;
-	/**
-	 * 下车点经度
-	 */
-	@TableField("getoffLon")
-	private Double getoffLon;
-	/**
-	 * 下车点纬度
-	 */
-	@TableField("getoffLat")
-	private Double getoffLat;
-	/**
-	 * 下车点
-	 */
-	@TableField("getoffAddress")
-	private String getoffAddress;
-	/**
-	 * 下车时间
-	 */
-	@TableField("getoffTime")
-	private Date getoffTime;
-	/**
-	 * 行驶里程数(米)
-	 */
-	@TableField("mileage")
-	private Double mileage;
-	/**
-	 * 支付方式(1=OK平台支付,2=其他方式支付)
-	 */
-	@TableField("payManner")
-	private Integer payManner;
-	/**
-	 * 支付方式(1=微信,2=支付宝,3=余额)
-	 */
-	@TableField("payType")
-	private Integer payType;
-	/**
-	 * 订单金额
-	 */
-	@TableField("orderMoney")
-	private Double orderMoney;
-	/**
-	 * 起步里程
-	 */
-	@TableField("startMileage")
-	private Double startMileage;
-	/**
-	 * 起步价
-	 */
-	@TableField("startMoney")
-	private Double startMoney;
-	/**
-	 * 里程公里
-	 */
-	@TableField("mileageKilometers")
-	private Double mileageKilometers;
-	/**
-	 * 里程费
-	 */
-	@TableField("mileageMoney")
-	private Double mileageMoney;
-	/**
-	 * 时长分钟
-	 */
-	@TableField("duration")
-	private Double duration;
-	/**
-	 * 时长费
-	 */
-	@TableField("durationMoney")
-	private Double durationMoney;
-	/**
-	 * 等待分钟
-	 */
-	@TableField("wait")
-	private Double wait;
-	/**
-	 * 等待费
-	 */
-	@TableField("waitMoney")
-	private Double waitMoney;
-	/**
-	 * 远途公里
-	 */
-	@TableField("longDistance")
-	private Double longDistance;
-	/**
-	 * 远途费
-	 */
-	@TableField("longDistanceMoney")
-	private Double longDistanceMoney;
-	/**
-	 * 停车费
-	 */
-	@TableField("parkMoney")
-	private Double parkMoney;
-	/**
-	 * 过路费
-	 */
-	@TableField("roadTollMoney")
-	private Double roadTollMoney;
-	//节假费
-	@TableField("holidayFee")
-	private Double holidayFee;
-	/**
-	 * 红包抵扣金额
-	 */
-	@TableField("redPacketMoney")
-	private Double redPacketMoney;
-	/**
-	 * 优惠券抵扣金额
-	 */
-	@TableField("couponMoney")
-	private Double couponMoney;
-	/**
-	 * 红包id
-	 */
-	@TableField("redPacketId")
-	private Integer redPacketId;
-	/**
-	 * 优惠券id
-	 */
-	@TableField("couponId")
-	private Integer couponId;
-	/**
-	 * 折扣
-	 */
-	@TableField("discount")
-	private Double discount;
-	/**
-	 * 折扣优惠金额
-	 */
-	@TableField("discountMoney")
-	private Double discountMoney;
-	/**
-	 * 折扣活动id
-	 */
-	@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")
-	private Integer companyId;
-	/**
-	 * 支付金额
-	 */
-	@TableField("payMoney")
-	private Double payMoney;
-	//感谢费
-	@TableField("thankYouFee")
-	private Double thankYouFee;
-	/**
-	 * 是否是代下单(0:否,1:是)
-	 */
-	@TableField("substitute")
-	private Integer substitute;
-	/**
-	 * 乘车人姓名
-	 */
-	@TableField("passengers")
-	private String passengers;
-	/**
-	 * 乘车人电话
-	 */
-	@TableField("passengersPhone")
-	private String passengersPhone;
-	/**
-	 * 订单状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中,12=取消待支付)
-	 */
-	@TableField("state")
-	private Integer state;
-	/**
-	 * 下单时间
-	 */
-	@TableField("insertTime")
-	private Date insertTime;
-	/**
-	 * 出行时间
-	 */
-	@TableField("travelTime")
-	private Date travelTime;
-	/**
-	 * 抢单时间
-	 */
-	@TableField("snatchOrderTime")
-	private Date snatchOrderTime;
-	/**
-	 * 司机点出发时间
-	 */
-	@TableField("setOutTime")
-	private Date setOutTime;
-	/**
-	 * 司机到达预约地点时间
-	 */
-	@TableField("arriveTime")
-	private Date arriveTime;
-	/**
-	 * 开始服务时间
-	 */
-	@TableField("startServiceTime")
-	private Date startServiceTime;
-	/**
-	 * 结束服务时间
-	 */
-	@TableField("endServiceTime")
-	private Date endServiceTime;
-	/**
-	 * 订单类型(1=普通,2=预约)
-	 */
-	@TableField("orderType")
-	private Integer orderType;
-	/**
-	 * 订单来源(1:APP下单,2:扫码下单,3:小程序下单,4:司机下单,5:调度下单)
-	 */
-	@TableField("orderSource")
-	private Integer orderSource;
-	/**
-	 * 发票id
-	 */
-	@TableField("invoiceId")
-	private Integer invoiceId;
-	/**
-	 * 是否是改派单(1=否,=是)
-	 *
-	 * @return
-	 */
-	@TableField("isReassign")
-	private Integer isReassign;
-	/**
-	 * 改派通知标识(0=没有改派,1=改派中,2=已改派)用于通知前端获取新司机数据
-	 */
-	@TableField("reassignNotice")
-	private Integer reassignNotice;
-	/**
-	 * 高德猎鹰轨迹id
-	 *
-	 * @return
-	 */
-	@TableField("trackId")
-	private String trackId;
-	/**
-	 * 是否删除(1=否,2=是)
-	 */
-	@TableField("isDelete")
-	private Integer isDelete;
-	/**
-	 * 该派前的订单状态
-	 *
-	 * @return
-	 */
-	@TableField("oldState")
-	private Integer oldState;
-	/**
-	 * 移动小号
-	 *
-	 * @return
-	 */
-	@TableField("telX")
-	private String telX;
-	/**
-	 * 绑定小号关系id
-	 *
-	 * @return
-	 */
-	@TableField("bindId")
-	private String bindId;
-	/**
-	 * 乘车人数
-	 */
-	@TableField("peopleNum")
-	private Integer peopleNum;
-	/**
-	 * 乘车类型(1=独享,2=一口价,3=拼车)
-	 */
-	@TableField("rideType")
-	private Integer rideType;
-	
-	@TableField("pid")
-	private Integer pid;
-	
-	/**
-	 * 是否异常订单 1否 2是
-	 */
-	@TableField("abnormal")
-	private Integer abnormal;
-	
-	
-	/**
-	 * 推广订单 1否 2是
-	 */
-	@TableField("promotion")
-	private Integer promotion;
-	
-	
-	private String promotionUser;
-	
-	private String promotionPhone;
-	
-	
-	/**
-	 * 乘客反馈情况
-	 */
-	@TableField("abnormalIntro")
-	private String abnormalIntro;
-	
-	/**
-	 * 乘客反馈图片
-	 */
-	@TableField("abnormalImg")
-	private String abnormalImg;
-	
-	
-	private Integer promotionDriverId;
-	
-	private BigDecimal promotionMoney;
-	
-	
-	private Integer totalPeopleNum;
-	/**
-	 * 预估里程(米)
-	 */
-	private Double estimateMileage;
-	
-	private Double estimateTime;
-	
-	private Integer spellSuccess;
-	
-	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;
-	
-	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;
-	}
-	
-	public void setResponsibilityType(Integer responsibilityType) {
-		this.responsibilityType = responsibilityType;
-	}
-	
-	public Integer getPromotion() {
-		return promotion;
-	}
-	
-	public void setPromotion(Integer promotion) {
-		this.promotion = promotion;
-	}
-	
-	public Integer getPromotionDriverId() {
-		return promotionDriverId;
-	}
-	
-	public void setPromotionDriverId(Integer promotionDriverId) {
-		this.promotionDriverId = promotionDriverId;
-	}
-	
-	public BigDecimal getPromotionMoney() {
-		return promotionMoney;
-	}
-	
-	public void setPromotionMoney(BigDecimal promotionMoney) {
-		this.promotionMoney = promotionMoney;
-	}
-	
-	public Integer getAbnormal() {
-		return abnormal;
-	}
-	
-	public void setAbnormal(Integer abnormal) {
-		this.abnormal = abnormal;
-	}
-	
-	public String getAbnormalIntro() {
-		return abnormalIntro;
-	}
-	
-	public void setAbnormalIntro(String abnormalIntro) {
-		this.abnormalIntro = abnormalIntro;
-	}
-	
-	public String getAbnormalImg() {
-		return abnormalImg;
-	}
-	
-	public void setAbnormalImg(String abnormalImg) {
-		this.abnormalImg = abnormalImg;
-	}
-	
-	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;
-	}
-	
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	
-	public Integer getType() {
-		return type;
-	}
-	
-	public void setType(Integer type) {
-		this.type = type;
-	}
-	
-	public Integer getCrossCityOrderId() {
-		return crossCityOrderId;
-	}
-	
-	public void setCrossCityOrderId(Integer crossCityOrderId) {
-		this.crossCityOrderId = crossCityOrderId;
-	}
-	
-	public Integer getPlace() {
-		return place;
-	}
-	
-	public void setPlace(Integer place) {
-		this.place = place;
-	}
-	
-	public Integer getUserId() {
-		return userId;
-	}
-	
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-	
-	public String getServerCarModel() {
-		return serverCarModel;
-	}
-	
-	public void setServerCarModel(String serverCarModel) {
-		this.serverCarModel = serverCarModel;
-	}
-	
-	public Integer getServerCarModelId() {
-		return serverCarModelId;
-	}
-	
-	public void setServerCarModelId(Integer serverCarModelId) {
-		this.serverCarModelId = serverCarModelId;
-	}
-	
-	public Integer getDriverId() {
-		return driverId;
-	}
-	
-	public void setDriverId(Integer driverId) {
-		this.driverId = driverId;
-	}
-	
-	public Integer getCarId() {
-		return carId;
-	}
-	
-	public void setCarId(Integer carId) {
-		this.carId = carId;
-	}
-	
-	public String getOrderNum() {
-		return orderNum;
-	}
-	
-	public void setOrderNum(String orderNum) {
-		this.orderNum = orderNum;
-	}
-	
-	public Double getPlacementLon() {
-		return placementLon;
-	}
-	
-	public void setPlacementLon(Double placementLon) {
-		this.placementLon = placementLon;
-	}
-	
-	public Double getPlacementLat() {
-		return placementLat;
-	}
-	
-	public void setPlacementLat(Double placementLat) {
-		this.placementLat = placementLat;
-	}
-	
-	public String getPlacementAddress() {
-		return placementAddress;
-	}
-	
-	public void setPlacementAddress(String placementAddress) {
-		this.placementAddress = placementAddress;
-	}
-	
-	public Double getStartLon() {
-		return startLon;
-	}
-	
-	public void setStartLon(Double startLon) {
-		this.startLon = startLon;
-	}
-	
-	public Double getStartLat() {
-		return startLat;
-	}
-	
-	public void setStartLat(Double startLat) {
-		this.startLat = startLat;
-	}
-	
-	public String getStartAddress() {
-		return startAddress;
-	}
-	
-	public void setStartAddress(String startAddress) {
-		this.startAddress = startAddress;
-	}
-	
-	public Double getEndLon() {
-		return endLon;
-	}
-	
-	public void setEndLon(Double endLon) {
-		this.endLon = endLon;
-	}
-	
-	public Double getEndLat() {
-		return endLat;
-	}
-	
-	public void setEndLat(Double endLat) {
-		this.endLat = endLat;
-	}
-	
-	public String getEndAddress() {
-		return endAddress;
-	}
-	
-	public void setEndAddress(String endAddress) {
-		this.endAddress = endAddress;
-	}
-	
-	public Double getBoardingLon() {
-		return boardingLon;
-	}
-	
-	public void setBoardingLon(Double boardingLon) {
-		this.boardingLon = boardingLon;
-	}
-	
-	public Double getBoardingLat() {
-		return boardingLat;
-	}
-	
-	public void setBoardingLat(Double boardingLat) {
-		this.boardingLat = boardingLat;
-	}
-	
-	public String getBoardingAddress() {
-		return boardingAddress;
-	}
-	
-	public void setBoardingAddress(String boardingAddress) {
-		this.boardingAddress = boardingAddress;
-	}
-	
-	public Date getBoardingTime() {
-		return boardingTime;
-	}
-	
-	public void setBoardingTime(Date boardingTime) {
-		this.boardingTime = boardingTime;
-	}
-	
-	public Double getGetoffLon() {
-		return getoffLon;
-	}
-	
-	public void setGetoffLon(Double getoffLon) {
-		this.getoffLon = getoffLon;
-	}
-	
-	public Double getGetoffLat() {
-		return getoffLat;
-	}
-	
-	public void setGetoffLat(Double getoffLat) {
-		this.getoffLat = getoffLat;
-	}
-	
-	public String getGetoffAddress() {
-		return getoffAddress;
-	}
-	
-	public void setGetoffAddress(String getoffAddress) {
-		this.getoffAddress = getoffAddress;
-	}
-	
-	public Date getGetoffTime() {
-		return getoffTime;
-	}
-	
-	public void setGetoffTime(Date getoffTime) {
-		this.getoffTime = getoffTime;
-	}
-	
-	public Double getMileage() {
-		return mileage;
-	}
-	
-	public void setMileage(Double mileage) {
-		this.mileage = mileage;
-	}
-	
-	public Integer getPayManner() {
-		return payManner;
-	}
-	
-	public void setPayManner(Integer payManner) {
-		this.payManner = payManner;
-	}
-	
-	public Integer getPayType() {
-		return payType;
-	}
-	
-	public void setPayType(Integer payType) {
-		this.payType = payType;
-	}
-	
-	public Double getOrderMoney() {
-		return orderMoney;
-	}
-	
-	public void setOrderMoney(Double orderMoney) {
-		this.orderMoney = orderMoney;
-	}
-	
-	public Double getStartMileage() {
-		return startMileage;
-	}
-	
-	public void setStartMileage(Double startMileage) {
-		this.startMileage = startMileage;
-	}
-	
-	public Double getStartMoney() {
-		return startMoney;
-	}
-	
-	public void setStartMoney(Double startMoney) {
-		this.startMoney = startMoney;
-	}
-	
-	public Double getMileageKilometers() {
-		return mileageKilometers;
-	}
-	
-	public void setMileageKilometers(Double mileageKilometers) {
-		this.mileageKilometers = mileageKilometers;
-	}
-	
-	public Double getMileageMoney() {
-		return mileageMoney;
-	}
-	
-	public void setMileageMoney(Double mileageMoney) {
-		this.mileageMoney = mileageMoney;
-	}
-	
-	public Double getDuration() {
-		return duration;
-	}
-	
-	public void setDuration(Double duration) {
-		this.duration = duration;
-	}
-	
-	public Double getDurationMoney() {
-		return durationMoney;
-	}
-	
-	public void setDurationMoney(Double durationMoney) {
-		this.durationMoney = durationMoney;
-	}
-	
-	public Double getWait() {
-		return wait;
-	}
-	
-	public void setWait(Double wait) {
-		this.wait = wait;
-	}
-	
-	public Double getWaitMoney() {
-		return waitMoney;
-	}
-	
-	public void setWaitMoney(Double waitMoney) {
-		this.waitMoney = waitMoney;
-	}
-	
-	public Double getLongDistance() {
-		return longDistance;
-	}
-	
-	public void setLongDistance(Double longDistance) {
-		this.longDistance = longDistance;
-	}
-	
-	public Double getLongDistanceMoney() {
-		return longDistanceMoney;
-	}
-	
-	public void setLongDistanceMoney(Double longDistanceMoney) {
-		this.longDistanceMoney = longDistanceMoney;
-	}
-	
-	public Double getParkMoney() {
-		return parkMoney;
-	}
-	
-	public void setParkMoney(Double parkMoney) {
-		this.parkMoney = parkMoney;
-	}
-	
-	public Double getRoadTollMoney() {
-		return roadTollMoney;
-	}
-	
-	public void setRoadTollMoney(Double roadTollMoney) {
-		this.roadTollMoney = roadTollMoney;
-	}
-	
-	public Double getHolidayFee() {
-		return holidayFee;
-	}
-	
-	public void setHolidayFee(Double holidayFee) {
-		this.holidayFee = holidayFee;
-	}
-	
-	public Double getRedPacketMoney() {
-		return redPacketMoney;
-	}
-	
-	public void setRedPacketMoney(Double redPacketMoney) {
-		this.redPacketMoney = redPacketMoney;
-	}
-	
-	public Double getCouponMoney() {
-		return couponMoney;
-	}
-	
-	public void setCouponMoney(Double couponMoney) {
-		this.couponMoney = couponMoney;
-	}
-	
-	public Integer getRedPacketId() {
-		return redPacketId;
-	}
-	
-	public void setRedPacketId(Integer redPacketId) {
-		this.redPacketId = redPacketId;
-	}
-	
-	public Integer getCouponId() {
-		return couponId;
-	}
-	
-	public void setCouponId(Integer couponId) {
-		this.couponId = couponId;
-	}
-	
-	public Double getDiscount() {
-		return discount;
-	}
-	
-	public void setDiscount(Double discount) {
-		this.discount = discount;
-	}
-	
-	public Double getDiscountMoney() {
-		return discountMoney;
-	}
-	
-	public void setDiscountMoney(Double discountMoney) {
-		this.discountMoney = discountMoney;
-	}
-	
-	public Integer getActivityId() {
-		return activityId;
-	}
-	
-	public void setActivityId(Integer activityId) {
-		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;
-	}
-	
-	public void setCompanyId(Integer companyId) {
-		this.companyId = companyId;
-	}
-	
-	public Double getPayMoney() {
-		return payMoney;
-	}
-	
-	public void setPayMoney(Double payMoney) {
-		this.payMoney = payMoney;
-	}
-	
-	public Double getThankYouFee() {
-		return thankYouFee;
-	}
-	
-	public void setThankYouFee(Double thankYouFee) {
-		this.thankYouFee = thankYouFee;
-	}
-	
-	public Integer getSubstitute() {
-		return substitute;
-	}
-	
-	public void setSubstitute(Integer substitute) {
-		this.substitute = substitute;
-	}
-	
-	public String getPassengers() {
-		return passengers;
-	}
-	
-	public void setPassengers(String passengers) {
-		this.passengers = passengers;
-	}
-	
-	public String getPassengersPhone() {
-		return passengersPhone;
-	}
-	
-	public void setPassengersPhone(String passengersPhone) {
-		this.passengersPhone = passengersPhone;
-	}
-	
-	public Integer getState() {
-		return state;
-	}
-	
-	public void setState(Integer state) {
-		this.state = state;
-	}
-	
-	public Date getInsertTime() {
-		return insertTime;
-	}
-	
-	public void setInsertTime(Date insertTime) {
-		this.insertTime = insertTime;
-	}
-	
-	public Date getTravelTime() {
-		return travelTime;
-	}
-	
-	public void setTravelTime(Date travelTime) {
-		this.travelTime = travelTime;
-	}
-	
-	public Date getSnatchOrderTime() {
-		return snatchOrderTime;
-	}
-	
-	public void setSnatchOrderTime(Date snatchOrderTime) {
-		this.snatchOrderTime = snatchOrderTime;
-	}
-	
-	public Date getSetOutTime() {
-		return setOutTime;
-	}
-	
-	public void setSetOutTime(Date setOutTime) {
-		this.setOutTime = setOutTime;
-	}
-	
-	public Date getArriveTime() {
-		return arriveTime;
-	}
-	
-	public void setArriveTime(Date arriveTime) {
-		this.arriveTime = arriveTime;
-	}
-	
-	public Date getStartServiceTime() {
-		return startServiceTime;
-	}
-	
-	public void setStartServiceTime(Date startServiceTime) {
-		this.startServiceTime = startServiceTime;
-	}
-	
-	public Date getEndServiceTime() {
-		return endServiceTime;
-	}
-	
-	public void setEndServiceTime(Date endServiceTime) {
-		this.endServiceTime = endServiceTime;
-	}
-	
-	public Integer getOrderType() {
-		return orderType;
-	}
-	
-	public void setOrderType(Integer orderType) {
-		this.orderType = orderType;
-	}
-	
-	public Integer getOrderSource() {
-		return orderSource;
-	}
-	
-	public void setOrderSource(Integer orderSource) {
-		this.orderSource = orderSource;
-	}
-	
-	public Integer getInvoiceId() {
-		return invoiceId;
-	}
-	
-	public void setInvoiceId(Integer invoiceId) {
-		this.invoiceId = invoiceId;
-	}
-	
-	public Integer getIsReassign() {
-		return isReassign;
-	}
-	
-	public void setIsReassign(Integer isReassign) {
-		this.isReassign = isReassign;
-	}
-	
-	public Integer getReassignNotice() {
-		return reassignNotice;
-	}
-	
-	public void setReassignNotice(Integer reassignNotice) {
-		this.reassignNotice = reassignNotice;
-	}
-	
-	public String getTrackId() {
-		return trackId;
-	}
-	
-	public void setTrackId(String trackId) {
-		this.trackId = trackId;
-	}
-	
-	public Integer getIsDelete() {
-		return isDelete;
-	}
-	
-	public void setIsDelete(Integer isDelete) {
-		this.isDelete = isDelete;
-	}
-	
-	public Integer getOldState() {
-		return oldState;
-	}
-	
-	public void setOldState(Integer oldState) {
-		this.oldState = oldState;
-	}
-	
-	public String getTelX() {
-		return telX;
-	}
-	
-	public void setTelX(String telX) {
-		this.telX = telX;
-	}
-	
-	public String getBindId() {
-		return bindId;
-	}
-	
-	public void setBindId(String bindId) {
-		this.bindId = bindId;
-	}
-	
-	public String getSplitAllocation() {
-		return splitAllocation;
-	}
-	
-	public void setSplitAllocation(String splitAllocation) {
-		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;
-	}
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @TableField("id")
+    private Integer id;
+    /**
+     * 订单类型(1=普通订单,2=摆渡订单)
+     */
+    @TableField("type")
+    private Integer type;
+    /**
+     * 跨城订单id(摆渡车专用)
+     */
+    @TableField("crossCityOrderId")
+    private Integer crossCityOrderId;
+    /**
+     * 摆渡方位(1=跨城起点,2=跨城终点)
+     */
+    @TableField("place")
+    private Integer place;
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Integer userId;
+    /**
+     * 服务车型
+     */
+    @TableField("serverCarModel")
+    private String serverCarModel;
+    /**
+     * 服务车型id
+     */
+    @TableField("serverCarModelId")
+    private Integer serverCarModelId;
+    /**
+     * 司机id
+     */
+    @TableField("driverId")
+    private Integer driverId;
+    /**
+     * 车辆id
+     */
+    @TableField("carId")
+    private Integer carId;
+    /**
+     * 订单号
+     */
+    @TableField("orderNum")
+    private String orderNum;
+    /**
+     * 下单地点经度
+     */
+    @TableField("placementLon")
+    private Double placementLon;
+    /**
+     * 下单地点纬度
+     */
+    @TableField("placementLat")
+    private Double placementLat;
+    /**
+     * 下单地点
+     */
+    @TableField("placementAddress")
+    private String placementAddress;
+    /**
+     * 起点经度
+     */
+    @TableField("startLon")
+    private Double startLon;
+    /**
+     * 起点纬度
+     */
+    @TableField("startLat")
+    private Double startLat;
+    /**
+     * 起点
+     */
+    @TableField("startAddress")
+    private String startAddress;
+    /**
+     * 目的地经度
+     */
+    @TableField("endLon")
+    private Double endLon;
+    /**
+     * 目的地纬度
+     */
+    @TableField("endLat")
+    private Double endLat;
+    /**
+     * 目的地
+     */
+    @TableField("endAddress")
+    private String endAddress;
+    /**
+     * 上车点经度
+     */
+    @TableField("boardingLon")
+    private Double boardingLon;
+    /**
+     * 上车点纬度
+     */
+    @TableField("boardingLat")
+    private Double boardingLat;
+    /**
+     * 上车地点
+     */
+    @TableField("boardingAddress")
+    private String boardingAddress;
+    /**
+     * 上车时间
+     */
+    @TableField("boardingTime")
+    private Date boardingTime;
+    /**
+     * 下车点经度
+     */
+    @TableField("getoffLon")
+    private Double getoffLon;
+    /**
+     * 下车点纬度
+     */
+    @TableField("getoffLat")
+    private Double getoffLat;
+    /**
+     * 下车点
+     */
+    @TableField("getoffAddress")
+    private String getoffAddress;
+    /**
+     * 下车时间
+     */
+    @TableField("getoffTime")
+    private Date getoffTime;
+    /**
+     * 行驶里程数(米)
+     */
+    @TableField("mileage")
+    private Double mileage;
+    /**
+     * 支付方式(1=OK平台支付,2=其他方式支付)
+     */
+    @TableField("payManner")
+    private Integer payManner;
+    /**
+     * 支付方式(1=微信,2=支付宝,3=余额)
+     */
+    @TableField("payType")
+    private Integer payType;
+    /**
+     * 订单金额
+     */
+    @TableField("orderMoney")
+    private Double orderMoney;
+    /**
+     * 起步里程
+     */
+    @TableField("startMileage")
+    private Double startMileage;
+    /**
+     * 起步价
+     */
+    @TableField("startMoney")
+    private Double startMoney;
+    /**
+     * 里程公里
+     */
+    @TableField("mileageKilometers")
+    private Double mileageKilometers;
+    /**
+     * 里程费
+     */
+    @TableField("mileageMoney")
+    private Double mileageMoney;
+    /**
+     * 时长分钟
+     */
+    @TableField("duration")
+    private Double duration;
+    /**
+     * 时长费
+     */
+    @TableField("durationMoney")
+    private Double durationMoney;
+    /**
+     * 等待分钟
+     */
+    @TableField("wait")
+    private Double wait;
+    /**
+     * 等待费
+     */
+    @TableField("waitMoney")
+    private Double waitMoney;
+    /**
+     * 远途公里
+     */
+    @TableField("longDistance")
+    private Double longDistance;
+    /**
+     * 远途费
+     */
+    @TableField("longDistanceMoney")
+    private Double longDistanceMoney;
+    /**
+     * 停车费
+     */
+    @TableField("parkMoney")
+    private Double parkMoney;
+    /**
+     * 过路费
+     */
+    @TableField("roadTollMoney")
+    private Double roadTollMoney;
+    //节假费
+    @TableField("holidayFee")
+    private Double holidayFee;
+    /**
+     * 红包抵扣金额
+     */
+    @TableField("redPacketMoney")
+    private Double redPacketMoney;
+    /**
+     * 优惠券抵扣金额
+     */
+    @TableField("couponMoney")
+    private Double couponMoney;
+    /**
+     * 红包id
+     */
+    @TableField("redPacketId")
+    private Integer redPacketId;
+    /**
+     * 优惠券id
+     */
+    @TableField("couponId")
+    private Integer couponId;
+    /**
+     * 折扣
+     */
+    @TableField("discount")
+    private Double discount;
+    /**
+     * 折扣优惠金额
+     */
+    @TableField("discountMoney")
+    private Double discountMoney;
+    /**
+     * 折扣活动id
+     */
+    @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")
+    private Integer companyId;
+    /**
+     * 支付金额
+     */
+    @TableField("payMoney")
+    private Double payMoney;
+    //感谢费
+    @TableField("thankYouFee")
+    private Double thankYouFee;
+    /**
+     * 是否是代下单(0:否,1:是)
+     */
+    @TableField("substitute")
+    private Integer substitute;
+    /**
+     * 乘车人姓名
+     */
+    @TableField("passengers")
+    private String passengers;
+    /**
+     * 乘车人电话
+     */
+    @TableField("passengersPhone")
+    private String passengersPhone;
+    /**
+     * 订单状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中,12=取消待支付)
+     */
+    @TableField("state")
+    private Integer state;
+    /**
+     * 下单时间
+     */
+    @TableField("insertTime")
+    private Date insertTime;
+    /**
+     * 出行时间
+     */
+    @TableField("travelTime")
+    private Date travelTime;
+    /**
+     * 抢单时间
+     */
+    @TableField("snatchOrderTime")
+    private Date snatchOrderTime;
+    /**
+     * 司机点出发时间
+     */
+    @TableField("setOutTime")
+    private Date setOutTime;
+    /**
+     * 司机到达预约地点时间
+     */
+    @TableField("arriveTime")
+    private Date arriveTime;
+    /**
+     * 开始服务时间
+     */
+    @TableField("startServiceTime")
+    private Date startServiceTime;
+    /**
+     * 结束服务时间
+     */
+    @TableField("endServiceTime")
+    private Date endServiceTime;
+    /**
+     * 订单类型(1=普通,2=预约)
+     */
+    @TableField("orderType")
+    private Integer orderType;
+    /**
+     * 订单来源(1:APP下单,2:扫码下单,3:小程序下单,4:司机下单,5:调度下单)
+     */
+    @TableField("orderSource")
+    private Integer orderSource;
+    /**
+     * 发票id
+     */
+    @TableField("invoiceId")
+    private Integer invoiceId;
+    /**
+     * 是否是改派单(1=否,=是)
+     *
+     * @return
+     */
+    @TableField("isReassign")
+    private Integer isReassign;
+    /**
+     * 改派通知标识(0=没有改派,1=改派中,2=已改派)用于通知前端获取新司机数据
+     */
+    @TableField("reassignNotice")
+    private Integer reassignNotice;
+    /**
+     * 高德猎鹰轨迹id
+     *
+     * @return
+     */
+    @TableField("trackId")
+    private String trackId;
+    /**
+     * 是否删除(1=否,2=是)
+     */
+    @TableField("isDelete")
+    private Integer isDelete;
+    /**
+     * 该派前的订单状态
+     *
+     * @return
+     */
+    @TableField("oldState")
+    private Integer oldState;
+    /**
+     * 移动小号
+     *
+     * @return
+     */
+    @TableField("telX")
+    private String telX;
+    /**
+     * 绑定小号关系id
+     *
+     * @return
+     */
+    @TableField("bindId")
+    private String bindId;
+    /**
+     * 乘车人数
+     */
+    @TableField("peopleNum")
+    private Integer peopleNum;
+    /**
+     * 乘车类型(1=独享,2=一口价,3=拼车)
+     */
+    @TableField("rideType")
+    private Integer rideType;
 
-	public Integer getIsGenerateRecoveryOrder() {
-		return isGenerateRecoveryOrder;
-	}
+    @TableField("pid")
+    private Integer pid;
 
-	public void setIsGenerateRecoveryOrder(Integer isGenerateRecoveryOrder) {
-		this.isGenerateRecoveryOrder = isGenerateRecoveryOrder;
-	}
+    /**
+     * 是否异常订单 1否 2是
+     */
+    @TableField("abnormal")
+    private Integer abnormal;
 
-	public Integer getOldOrderId() {
-		return oldOrderId;
-	}
 
-	public void setOldOrderId(Integer oldOrderId) {
-		this.oldOrderId = oldOrderId;
-	}
+    /**
+     * 推广订单 1否 2是
+     */
+    @TableField("promotion")
+    private Integer promotion;
 
-	@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 +
-			'}';
-}}
+
+    private Date successTime;
+    private String promotionUser;
+
+    private String promotionPhone;
+
+
+    /**
+     * 乘客反馈情况
+     */
+    @TableField("abnormalIntro")
+    private String abnormalIntro;
+
+    /**
+     * 乘客反馈图片
+     */
+    @TableField("abnormalImg")
+    private String abnormalImg;
+
+
+    private Integer promotionDriverId;
+
+    private BigDecimal promotionMoney;
+
+
+    private Integer totalPeopleNum;
+    /**
+     * 预估里程(米)
+     */
+    private Double estimateMileage;
+
+    private Double estimateTime;
+
+    private Integer spellSuccess;
+
+    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 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;
+    }
+
+    public void setResponsibilityType(Integer responsibilityType) {
+        this.responsibilityType = responsibilityType;
+    }
+
+    public Integer getPromotion() {
+        return promotion;
+    }
+
+    public void setPromotion(Integer promotion) {
+        this.promotion = promotion;
+    }
+
+    public Integer getPromotionDriverId() {
+        return promotionDriverId;
+    }
+
+    public void setPromotionDriverId(Integer promotionDriverId) {
+        this.promotionDriverId = promotionDriverId;
+    }
+
+    public BigDecimal getPromotionMoney() {
+        return promotionMoney;
+    }
+
+    public void setPromotionMoney(BigDecimal promotionMoney) {
+        this.promotionMoney = promotionMoney;
+    }
+
+    public Integer getAbnormal() {
+        return abnormal;
+    }
+
+    public void setAbnormal(Integer abnormal) {
+        this.abnormal = abnormal;
+    }
+
+    public String getAbnormalIntro() {
+        return abnormalIntro;
+    }
+
+    public void setAbnormalIntro(String abnormalIntro) {
+        this.abnormalIntro = abnormalIntro;
+    }
+
+    public String getAbnormalImg() {
+        return abnormalImg;
+    }
+
+    public void setAbnormalImg(String abnormalImg) {
+        this.abnormalImg = abnormalImg;
+    }
+
+    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;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getCrossCityOrderId() {
+        return crossCityOrderId;
+    }
+
+    public void setCrossCityOrderId(Integer crossCityOrderId) {
+        this.crossCityOrderId = crossCityOrderId;
+    }
+
+    public Integer getPlace() {
+        return place;
+    }
+
+    public void setPlace(Integer place) {
+        this.place = place;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getServerCarModel() {
+        return serverCarModel;
+    }
+
+    public void setServerCarModel(String serverCarModel) {
+        this.serverCarModel = serverCarModel;
+    }
+
+    public Integer getServerCarModelId() {
+        return serverCarModelId;
+    }
+
+    public void setServerCarModelId(Integer serverCarModelId) {
+        this.serverCarModelId = serverCarModelId;
+    }
+
+    public Integer getDriverId() {
+        return driverId;
+    }
+
+    public void setDriverId(Integer driverId) {
+        this.driverId = driverId;
+    }
+
+    public Integer getCarId() {
+        return carId;
+    }
+
+    public void setCarId(Integer carId) {
+        this.carId = carId;
+    }
+
+    public String getOrderNum() {
+        return orderNum;
+    }
+
+    public void setOrderNum(String orderNum) {
+        this.orderNum = orderNum;
+    }
+
+    public Double getPlacementLon() {
+        return placementLon;
+    }
+
+    public void setPlacementLon(Double placementLon) {
+        this.placementLon = placementLon;
+    }
+
+    public Double getPlacementLat() {
+        return placementLat;
+    }
+
+    public void setPlacementLat(Double placementLat) {
+        this.placementLat = placementLat;
+    }
+
+    public String getPlacementAddress() {
+        return placementAddress;
+    }
+
+    public void setPlacementAddress(String placementAddress) {
+        this.placementAddress = placementAddress;
+    }
+
+    public Double getStartLon() {
+        return startLon;
+    }
+
+    public void setStartLon(Double startLon) {
+        this.startLon = startLon;
+    }
+
+    public Double getStartLat() {
+        return startLat;
+    }
+
+    public void setStartLat(Double startLat) {
+        this.startLat = startLat;
+    }
+
+    public String getStartAddress() {
+        return startAddress;
+    }
+
+    public void setStartAddress(String startAddress) {
+        this.startAddress = startAddress;
+    }
+
+    public Double getEndLon() {
+        return endLon;
+    }
+
+    public void setEndLon(Double endLon) {
+        this.endLon = endLon;
+    }
+
+    public Double getEndLat() {
+        return endLat;
+    }
+
+    public void setEndLat(Double endLat) {
+        this.endLat = endLat;
+    }
+
+    public String getEndAddress() {
+        return endAddress;
+    }
+
+    public void setEndAddress(String endAddress) {
+        this.endAddress = endAddress;
+    }
+
+    public Double getBoardingLon() {
+        return boardingLon;
+    }
+
+    public void setBoardingLon(Double boardingLon) {
+        this.boardingLon = boardingLon;
+    }
+
+    public Double getBoardingLat() {
+        return boardingLat;
+    }
+
+    public void setBoardingLat(Double boardingLat) {
+        this.boardingLat = boardingLat;
+    }
+
+    public String getBoardingAddress() {
+        return boardingAddress;
+    }
+
+    public void setBoardingAddress(String boardingAddress) {
+        this.boardingAddress = boardingAddress;
+    }
+
+    public Date getBoardingTime() {
+        return boardingTime;
+    }
+
+    public void setBoardingTime(Date boardingTime) {
+        this.boardingTime = boardingTime;
+    }
+
+    public Double getGetoffLon() {
+        return getoffLon;
+    }
+
+    public void setGetoffLon(Double getoffLon) {
+        this.getoffLon = getoffLon;
+    }
+
+    public Double getGetoffLat() {
+        return getoffLat;
+    }
+
+    public void setGetoffLat(Double getoffLat) {
+        this.getoffLat = getoffLat;
+    }
+
+    public String getGetoffAddress() {
+        return getoffAddress;
+    }
+
+    public void setGetoffAddress(String getoffAddress) {
+        this.getoffAddress = getoffAddress;
+    }
+
+    public Date getGetoffTime() {
+        return getoffTime;
+    }
+
+    public void setGetoffTime(Date getoffTime) {
+        this.getoffTime = getoffTime;
+    }
+
+    public Double getMileage() {
+        return mileage;
+    }
+
+    public void setMileage(Double mileage) {
+        this.mileage = mileage;
+    }
+
+    public Integer getPayManner() {
+        return payManner;
+    }
+
+    public void setPayManner(Integer payManner) {
+        this.payManner = payManner;
+    }
+
+    public Integer getPayType() {
+        return payType;
+    }
+
+    public void setPayType(Integer payType) {
+        this.payType = payType;
+    }
+
+    public Double getOrderMoney() {
+        return orderMoney;
+    }
+
+    public void setOrderMoney(Double orderMoney) {
+        this.orderMoney = orderMoney;
+    }
+
+    public Double getStartMileage() {
+        return startMileage;
+    }
+
+    public void setStartMileage(Double startMileage) {
+        this.startMileage = startMileage;
+    }
+
+    public Double getStartMoney() {
+        return startMoney;
+    }
+
+    public void setStartMoney(Double startMoney) {
+        this.startMoney = startMoney;
+    }
+
+    public Double getMileageKilometers() {
+        return mileageKilometers;
+    }
+
+    public void setMileageKilometers(Double mileageKilometers) {
+        this.mileageKilometers = mileageKilometers;
+    }
+
+    public Double getMileageMoney() {
+        return mileageMoney;
+    }
+
+    public void setMileageMoney(Double mileageMoney) {
+        this.mileageMoney = mileageMoney;
+    }
+
+    public Double getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Double duration) {
+        this.duration = duration;
+    }
+
+    public Double getDurationMoney() {
+        return durationMoney;
+    }
+
+    public void setDurationMoney(Double durationMoney) {
+        this.durationMoney = durationMoney;
+    }
+
+    public Double getWait() {
+        return wait;
+    }
+
+    public void setWait(Double wait) {
+        this.wait = wait;
+    }
+
+    public Double getWaitMoney() {
+        return waitMoney;
+    }
+
+    public void setWaitMoney(Double waitMoney) {
+        this.waitMoney = waitMoney;
+    }
+
+    public Double getLongDistance() {
+        return longDistance;
+    }
+
+    public void setLongDistance(Double longDistance) {
+        this.longDistance = longDistance;
+    }
+
+    public Double getLongDistanceMoney() {
+        return longDistanceMoney;
+    }
+
+    public void setLongDistanceMoney(Double longDistanceMoney) {
+        this.longDistanceMoney = longDistanceMoney;
+    }
+
+    public Double getParkMoney() {
+        return parkMoney;
+    }
+
+    public void setParkMoney(Double parkMoney) {
+        this.parkMoney = parkMoney;
+    }
+
+    public Double getRoadTollMoney() {
+        return roadTollMoney;
+    }
+
+    public void setRoadTollMoney(Double roadTollMoney) {
+        this.roadTollMoney = roadTollMoney;
+    }
+
+    public Double getHolidayFee() {
+        return holidayFee;
+    }
+
+    public void setHolidayFee(Double holidayFee) {
+        this.holidayFee = holidayFee;
+    }
+
+    public Double getRedPacketMoney() {
+        return redPacketMoney;
+    }
+
+    public void setRedPacketMoney(Double redPacketMoney) {
+        this.redPacketMoney = redPacketMoney;
+    }
+
+    public Double getCouponMoney() {
+        return couponMoney;
+    }
+
+    public void setCouponMoney(Double couponMoney) {
+        this.couponMoney = couponMoney;
+    }
+
+    public Integer getRedPacketId() {
+        return redPacketId;
+    }
+
+    public void setRedPacketId(Integer redPacketId) {
+        this.redPacketId = redPacketId;
+    }
+
+    public Integer getCouponId() {
+        return couponId;
+    }
+
+    public void setCouponId(Integer couponId) {
+        this.couponId = couponId;
+    }
+
+    public Double getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(Double discount) {
+        this.discount = discount;
+    }
+
+    public Double getDiscountMoney() {
+        return discountMoney;
+    }
+
+    public void setDiscountMoney(Double discountMoney) {
+        this.discountMoney = discountMoney;
+    }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        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;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public Double getPayMoney() {
+        return payMoney;
+    }
+
+    public void setPayMoney(Double payMoney) {
+        this.payMoney = payMoney;
+    }
+
+    public Double getThankYouFee() {
+        return thankYouFee;
+    }
+
+    public void setThankYouFee(Double thankYouFee) {
+        this.thankYouFee = thankYouFee;
+    }
+
+    public Integer getSubstitute() {
+        return substitute;
+    }
+
+    public void setSubstitute(Integer substitute) {
+        this.substitute = substitute;
+    }
+
+    public String getPassengers() {
+        return passengers;
+    }
+
+    public void setPassengers(String passengers) {
+        this.passengers = passengers;
+    }
+
+    public String getPassengersPhone() {
+        return passengersPhone;
+    }
+
+    public void setPassengersPhone(String passengersPhone) {
+        this.passengersPhone = passengersPhone;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public Date getTravelTime() {
+        return travelTime;
+    }
+
+    public void setTravelTime(Date travelTime) {
+        this.travelTime = travelTime;
+    }
+
+    public Date getSnatchOrderTime() {
+        return snatchOrderTime;
+    }
+
+    public void setSnatchOrderTime(Date snatchOrderTime) {
+        this.snatchOrderTime = snatchOrderTime;
+    }
+
+    public Date getSetOutTime() {
+        return setOutTime;
+    }
+
+    public void setSetOutTime(Date setOutTime) {
+        this.setOutTime = setOutTime;
+    }
+
+    public Date getArriveTime() {
+        return arriveTime;
+    }
+
+    public void setArriveTime(Date arriveTime) {
+        this.arriveTime = arriveTime;
+    }
+
+    public Date getStartServiceTime() {
+        return startServiceTime;
+    }
+
+    public void setStartServiceTime(Date startServiceTime) {
+        this.startServiceTime = startServiceTime;
+    }
+
+    public Date getEndServiceTime() {
+        return endServiceTime;
+    }
+
+    public void setEndServiceTime(Date endServiceTime) {
+        this.endServiceTime = endServiceTime;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public Integer getOrderSource() {
+        return orderSource;
+    }
+
+    public void setOrderSource(Integer orderSource) {
+        this.orderSource = orderSource;
+    }
+
+    public Integer getInvoiceId() {
+        return invoiceId;
+    }
+
+    public void setInvoiceId(Integer invoiceId) {
+        this.invoiceId = invoiceId;
+    }
+
+    public Integer getIsReassign() {
+        return isReassign;
+    }
+
+    public void setIsReassign(Integer isReassign) {
+        this.isReassign = isReassign;
+    }
+
+    public Integer getReassignNotice() {
+        return reassignNotice;
+    }
+
+    public void setReassignNotice(Integer reassignNotice) {
+        this.reassignNotice = reassignNotice;
+    }
+
+    public String getTrackId() {
+        return trackId;
+    }
+
+    public void setTrackId(String trackId) {
+        this.trackId = trackId;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Integer getOldState() {
+        return oldState;
+    }
+
+    public void setOldState(Integer oldState) {
+        this.oldState = oldState;
+    }
+
+    public String getTelX() {
+        return telX;
+    }
+
+    public void setTelX(String telX) {
+        this.telX = telX;
+    }
+
+    public String getBindId() {
+        return bindId;
+    }
+
+    public void setBindId(String bindId) {
+        this.bindId = bindId;
+    }
+
+    public String getSplitAllocation() {
+        return splitAllocation;
+    }
+
+    public void setSplitAllocation(String splitAllocation) {
+        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;
+    }
+
+    @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