java/TianMa.git

			@@ -10,7 +10,7 @@

			/**
			* <p>
			* 订单-快车
			* 订单-专车
			* </p>
			*
			* @author 吕雪
			@@ -31,21 +31,9 @@
			*/
			private Integer type;
			/**
			* 跨城订单id（摆渡车用）
			*/
			private Integer crossCityOrderId;
			/**
			* 摆渡方位（1=跨城起点，2=跨城终点）
			*/
			private Integer place;
			/**
			* 用户id
			*/
			private Integer userId;
			/**
			* 服务车型
			*/
			private Integer serverCarModelId;
			/**
			* 接单司机ID
			*/
			@@ -143,41 +131,17 @@
			*/
			private BigDecimal orderMoney;
			/**
			* 起步里程
			*/
			private Double startMileage;
			/**
			* 起步价
			*/
			private BigDecimal startMoney;
			/**
			* 里程公里
			*/
			private Double mileageKilometers;
			/**
			* 里程费
			*/
			private BigDecimal mileageMoney;
			/**
			* 时长分钟
			*/
			private Double duration;
			/**
			* 时长费
			*/
			private BigDecimal durationMoney;
			/**
			* 等待分钟
			*/
			private Double wait;
			/**
			* 等待费
			*/
			private BigDecimal waitMoney;
			/**
			* 远途公里
			*/
			private Double longDistance;
			/**
			* 远途费
			*/
			@@ -190,10 +154,6 @@
			* 过路费
			*/
			private BigDecimal roadTollMoney;
			/**
			* 节假日费
			*/
			private BigDecimal holidayFee;
			/**
			* 红包抵扣金额
			*/
			@@ -223,18 +183,6 @@
			*/
			private Integer activityId;
			/**
			* 打车卡id
			*/
			private Integer taxiCardId;
			/**
			* 打车卡记录id
			*/
			private Integer userTaxiCardId;
			/**
			* 优惠金额
			*/
			private Double discountAmount;
			/**
			* 公司id
			*/
			private Integer companyId;
			@@ -242,14 +190,6 @@
			* 支付金额
			*/
			private BigDecimal payMoney;
			/**
			* 感谢费
			*/
			private BigDecimal thankYouFee;
			/**
			* 备注
			*/
			private String remark;
			/**
			* 是否是代下单（0：否，1：是）
			*/
			@@ -334,6 +274,10 @@
			* 移动小号绑定关系id
			*/
			private String bindId;
			/**
			* 专车车型ID 关联t_server_carmodel表
			*/
			private Integer serverCarModelId;


			public Integer getId() {
			@@ -352,36 +296,12 @@
			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 Integer getServerCarModelId() {
			return serverCarModelId;
			}

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

			public Integer getDriverId() {
			@@ -576,28 +496,12 @@
			this.orderMoney = orderMoney;
			}

			public Double getStartMileage() {
			return startMileage;
			}

			public void setStartMileage(Double startMileage) {
			this.startMileage = startMileage;
			}

			public BigDecimal getStartMoney() {
			return startMoney;
			}

			public void setStartMoney(BigDecimal startMoney) {
			this.startMoney = startMoney;
			}

			public Double getMileageKilometers() {
			return mileageKilometers;
			}

			public void setMileageKilometers(Double mileageKilometers) {
			this.mileageKilometers = mileageKilometers;
			}

			public BigDecimal getMileageMoney() {
			@@ -608,44 +512,12 @@
			this.mileageMoney = mileageMoney;
			}

			public Double getDuration() {
			return duration;
			}

			public void setDuration(Double duration) {
			this.duration = duration;
			}

			public BigDecimal getDurationMoney() {
			return durationMoney;
			}

			public void setDurationMoney(BigDecimal durationMoney) {
			this.durationMoney = durationMoney;
			}

			public Double getWait() {
			return wait;
			}

			public void setWait(Double wait) {
			this.wait = wait;
			}

			public BigDecimal getWaitMoney() {
			return waitMoney;
			}

			public void setWaitMoney(BigDecimal waitMoney) {
			this.waitMoney = waitMoney;
			}

			public Double getLongDistance() {
			return longDistance;
			}

			public void setLongDistance(Double longDistance) {
			this.longDistance = longDistance;
			}

			public BigDecimal getLongDistanceMoney() {
			@@ -670,14 +542,6 @@

			public void setRoadTollMoney(BigDecimal roadTollMoney) {
			this.roadTollMoney = roadTollMoney;
			}

			public BigDecimal getHolidayFee() {
			return holidayFee;
			}

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

			public BigDecimal getRedPacketMoney() {
			@@ -736,30 +600,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;
			}
			@@ -774,22 +614,6 @@

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

			public BigDecimal getThankYouFee() {
			return thankYouFee;
			}

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

			public String getRemark() {
			return remark;
			}

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

			public Integer getSubstitute() {
			@@ -960,6 +784,14 @@
			this.bindId = bindId;
			}

			public Integer getServerCarModelId() {
			return serverCarModelId;
			}

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

			@Override
			protected Serializable pkVal() {
			return this.id;
			@@ -968,84 +800,70 @@
			@Override
			public String toString() {
			return "TOrderPrivateCar{" +
			"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 +
			", endLon=" + endLon +
			", startAddress=" + startAddress +
			", 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 +
			", remark=" + remark +
			", 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 +
			"}";
			"id=" + id +
			", type=" + type +
			", userId=" + userId +
			", driverId=" + driverId +
			", carId=" + carId +
			", orderNum=" + orderNum +
			", placementLon=" + placementLon +
			", placementLat=" + placementLat +
			", placementAddress=" + placementAddress +
			", startLon=" + startLon +
			", startLat=" + startLat +
			", endLon=" + endLon +
			", startAddress=" + startAddress +
			", 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 +
			", startMoney=" + startMoney +
			", mileageMoney=" + mileageMoney +
			", durationMoney=" + durationMoney +
			", 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 +
			", serverCarModelId=" + serverCarModelId +
			"}";
			}
			}