java/TianMa.git

			@@ -32,10 +32,6 @@
			*/
			private Integer userId;
			/**
			* 服务车型
			*/
			private Integer serverCarModelId;
			/**
			* 接单司机ID
			*/
			private Integer driverId;
			@@ -44,13 +40,18 @@
			*/
			private Integer lineId;
			/**
			* 预约班次数据id
			* 预约班次的id
			*/
			@TableField("lineShiftDriverId")
			private Integer lineShiftDriverId;
			/**
			* 车辆id
			*/
			private Integer carId;
			/**
			* 服务车型id关联t_server_carmodel表
			*/
			private Integer serverCarModelId;
			/**
			* 订单号
			*/
			@@ -136,10 +137,6 @@
			*/
			private Integer payType;
			/**
			* 节假费
			*/
			private BigDecimal holidayFee;
			/**
			* 订单金额
			*/
			private BigDecimal orderMoney;
			@@ -172,18 +169,6 @@
			*/
			private Integer activityId;
			/**
			* 打车卡id
			*/
			private Integer taxiCardId;
			/**
			* 打车卡记录id
			*/
			private Integer userTaxiCardId;
			/**
			* 优惠金额
			*/
			private Double discountAmount;
			/**
			* 公司id
			*/
			private Integer companyId;
			@@ -192,9 +177,15 @@
			*/
			private BigDecimal payMoney;
			/**
			* 感谢费
			* 出行人数
			*/
			private BigDecimal thankYouFee;
			@TableField("peopleNumber")
			private Integer peopleNumber;
			/**
			* 座位编号
			*/
			@TableField("seatNumber")
			private String seatNumber;
			/**
			* 乘车人
			*/
			@@ -204,21 +195,9 @@
			*/
			private String passengersPhone;
			/**
			* 出行人数
			*/
			private Integer peopleNumber;
			/**
			* 座位编号
			*/
			private String seatNumber;
			/**
			* 排序(订单为拼车时的排序-不是所有订单的排序)
			* 排序
			*/
			private Integer sort;
			/**
			* 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付)
			*/
			private Integer state;
			/**
			* 下单时间
			*/
			@@ -256,25 +235,21 @@
			*/
			private Integer orderSource;
			/**
			* 备注
			*/
			private String remark;
			/**
			* 发票id
			*/
			private Integer invoiceId;
			/**
			* 是否是改派单（1=否，2=是）
			*/
			private Integer isReassign;
			/**
			* 改派通知（0=没有改派，1=改派中，2=已改派）
			*/
			private Integer reassignNotice;
			/**
			* 高德猎鹰上的轨迹id
			*/
			private String trackId;
			/**
			* 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付)
			*/
			private Integer state;
			/**
			* 是否是改派订单（1=否，2=是）
			*/
			private Integer isReassign;
			/**
			* 是否删除 1=否 2=是
			*/
			@@ -291,11 +266,14 @@
			* 移动小号绑定关系id
			*/
			private String bindId;
			/**
			* 工行支付下单订单号
			*/
			private String payOrderId;

			public Integer getOldState() {
			return oldState;
			}

			public void setOldState(Integer oldState) {
			this.oldState = oldState;
			}

			public Integer getId() {
			return id;
			@@ -311,14 +289,6 @@

			public void setUserId(Integer userId) {
			this.userId = userId;
			}

			public Integer getServerCarModelId() {
			return serverCarModelId;
			}

			public void setServerCarModelId(Integer serverCarModelId) {
			this.serverCarModelId = serverCarModelId;
			}

			public Integer getDriverId() {
			@@ -351,6 +321,14 @@

			public void setCarId(Integer carId) {
			this.carId = carId;
			}

			public Integer getServerCarModelId() {
			return serverCarModelId;
			}

			public void setServerCarModelId(Integer serverCarModelId) {
			this.serverCarModelId = serverCarModelId;
			}

			public String getOrderNum() {
			@@ -521,14 +499,6 @@
			this.payType = payType;
			}

			public BigDecimal getHolidayFee() {
			return holidayFee;
			}

			public void setHolidayFee(BigDecimal holidayFee) {
			this.holidayFee = holidayFee;
			}

			public BigDecimal getOrderMoney() {
			return orderMoney;
			}
			@@ -593,30 +563,6 @@
			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;
			}
			@@ -631,14 +577,6 @@

			public void setPayMoney(BigDecimal payMoney) {
			this.payMoney = payMoney;
			}

			public BigDecimal getThankYouFee() {
			return thankYouFee;
			}

			public void setThankYouFee(BigDecimal thankYouFee) {
			this.thankYouFee = thankYouFee;
			}

			public String getPassengers() {
			@@ -657,36 +595,12 @@
			this.passengersPhone = passengersPhone;
			}

			public Integer getPeopleNumber() {
			return peopleNumber;
			}

			public void setPeopleNumber(Integer peopleNumber) {
			this.peopleNumber = peopleNumber;
			}

			public String getSeatNumber() {
			return seatNumber;
			}

			public void setSeatNumber(String seatNumber) {
			this.seatNumber = seatNumber;
			}

			public Integer getSort() {
			return sort;
			}

			public void setSort(Integer sort) {
			this.sort = sort;
			}

			public Integer getState() {
			return state;
			}

			public void setState(Integer state) {
			this.state = state;
			}

			public Date getInsertTime() {
			@@ -761,36 +675,12 @@
			this.orderSource = orderSource;
			}

			public String getRemark() {
			return remark;
			}

			public void setRemark(String remark) {
			this.remark = remark;
			}

			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() {
			@@ -801,20 +691,20 @@
			this.trackId = trackId;
			}

			public Integer getState() {
			return state;
			}

			public void setState(Integer state) {
			this.state = state;
			}

			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() {
			@@ -833,12 +723,28 @@
			this.bindId = bindId;
			}

			public String getPayOrderId() {
			return payOrderId;
			public Integer getIsReassign() {
			return isReassign;
			}

			public void setPayOrderId(String payOrderId) {
			this.payOrderId = payOrderId;
			public void setIsReassign(Integer isReassign) {
			this.isReassign = isReassign;
			}

			public Integer getPeopleNumber() {
			return peopleNumber;
			}

			public void setPeopleNumber(Integer peopleNumber) {
			this.peopleNumber = peopleNumber;
			}

			public String getSeatNumber() {
			return seatNumber;
			}

			public void setSeatNumber(String seatNumber) {
			this.seatNumber = seatNumber;
			}

			@Override
			@@ -851,33 +757,32 @@
			return "TOrderCrossCity{" +
			"id=" + id +
			", userId=" + userId +
			", serverCarModelId=" + serverCarModelId +
			", driverId=" + driverId +
			", lineId=" + lineId +
			", lineShiftDriverId=" + lineShiftDriverId +
			", carId=" + carId +
			", orderNum=" + orderNum +
			", serverCarModelId=" + serverCarModelId +
			", orderNum='" + orderNum + '\'' +
			", placementLon=" + placementLon +
			", placementLat=" + placementLat +
			", placementAddress=" + placementAddress +
			", placementAddress='" + placementAddress + '\'' +
			", startLon=" + startLon +
			", startLat=" + startLat +
			", endLon=" + endLon +
			", startAddress=" + startAddress +
			", startAddress='" + startAddress + '\'' +
			", endLat=" + endLat +
			", endAddress=" + endAddress +
			", endAddress='" + endAddress + '\'' +
			", boardingLon=" + boardingLon +
			", boardingLat=" + boardingLat +
			", boardingAddress=" + boardingAddress +
			", boardingAddress='" + boardingAddress + '\'' +
			", boardingTime=" + boardingTime +
			", getoffLon=" + getoffLon +
			", getoffLat=" + getoffLat +
			", getoffAddress=" + getoffAddress +
			", getoffAddress='" + getoffAddress + '\'' +
			", getoffTime=" + getoffTime +
			", mileage=" + mileage +
			", payManner=" + payManner +
			", payType=" + payType +
			", holidayFee=" + holidayFee +
			", orderMoney=" + orderMoney +
			", redPacketMoney=" + redPacketMoney +
			", couponMoney=" + couponMoney +
			@@ -886,18 +791,11 @@
			", discount=" + discount +
			", discountMoney=" + discountMoney +
			", activityId=" + activityId +
			", taxiCardId=" + taxiCardId +
			", userTaxiCardId=" + userTaxiCardId +
			", discountAmount=" + discountAmount +
			", companyId=" + companyId +
			", payMoney=" + payMoney +
			", thankYouFee=" + thankYouFee +
			", passengers=" + passengers +
			", passengersPhone=" + passengersPhone +
			", peopleNumber=" + peopleNumber +
			", seatNumber=" + seatNumber +
			", passengers='" + passengers + '\'' +
			", passengersPhone='" + passengersPhone + '\'' +
			", sort=" + sort +
			", state=" + state +
			", insertTime=" + insertTime +
			", travelTime=" + travelTime +
			", snatchOrderTime=" + snatchOrderTime +
			@@ -907,16 +805,14 @@
			", endServiceTime=" + endServiceTime +
			", travelMode=" + travelMode +
			", orderSource=" + orderSource +
			", remark=" + remark +
			", invoiceId=" + invoiceId +
			", trackId='" + trackId + '\'' +
			", state=" + state +
			", isReassign=" + isReassign +
			", reassignNotice=" + reassignNotice +
			", trackId=" + trackId +
			", isDelete=" + isDelete +
			", oldState=" + oldState +
			", telX=" + telX +
			", bindId=" + bindId +
			", payOrderId=" + payOrderId +
			"}";
			", telX='" + telX + '\'' +
			", bindId='" + bindId + '\'' +
			'}';
			}
			}