java/TianMa.git

			@@ -51,21 +51,9 @@
			*/
			private Integer cargoType;
			/**
			* 是否加急（1=否，2=是）
			*/
			private Integer urgent;
			/**
			* 货物数量
			*/
			private Integer cargoNumber;
			/**
			* 用户上传的图片，多个英文分号分隔
			*/
			private String userImg;
			/**
			* 司机上传的图片，多个英文分号分隔
			*/
			private String driverImg;
			/**
			* 备注
			*/
			@@ -171,10 +159,6 @@
			*/
			private BigDecimal tipMoney;
			/**
			* 节假费
			*/
			private BigDecimal holidayFee;
			/**
			* 红包抵扣金额
			*/
			private BigDecimal redPacketMoney;
			@@ -203,18 +187,6 @@
			*/
			private Integer activityId;
			/**
			* 打车卡id
			*/
			private Integer taxiCardId;
			/**
			* 打车卡记录id
			*/
			private Integer userTaxiCardId;
			/**
			* 优惠金额
			*/
			private Double discountAmount;
			/**
			* 公司id
			*/
			private Integer companyId;
			@@ -223,11 +195,7 @@
			*/
			private BigDecimal payMoney;
			/**
			* 感谢费
			*/
			private BigDecimal thankYouFee;
			/**
			* 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=改派中，12=已支付差价)
			* 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=服务中，6=完成服务，7=待支付，9=已完成，10=已取消)
			*/
			private Integer state;
			/**
			@@ -286,27 +254,14 @@
			* 移动小号绑定关系id
			*/
			private String bindId;
			/**
			* 取件码
			*/
			private String pickUpCode;
			/**
			* 是否是改派单（1=否，2=是）
			*/
			private Integer isReassign;
			/**
			* 改派通知（0=没有改派，1=改派中，2=已改派）
			*/
			private Integer reassignNotice;
			/**
			* 需要送达时间（用户端指定）
			*/
			private Date arriveTimeExpect;
			/**
			* 超时扣款
			*/
			private BigDecimal timeOutMoney;

			public Integer getOldState() {
			return oldState;
			}

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

			public Integer getId() {
			return id;
			@@ -364,36 +319,12 @@
			this.cargoType = cargoType;
			}

			public Integer getUrgent() {
			return urgent;
			}

			public void setUrgent(Integer urgent) {
			this.urgent = urgent;
			}

			public Integer getCargoNumber() {
			return cargoNumber;
			}

			public void setCargoNumber(Integer cargoNumber) {
			this.cargoNumber = cargoNumber;
			}

			public String getUserImg() {
			return userImg;
			}

			public void setUserImg(String userImg) {
			this.userImg = userImg;
			}

			public String getDriverImg() {
			return driverImg;
			}

			public void setDriverImg(String driverImg) {
			this.driverImg = driverImg;
			}

			public String getRemark() {
			@@ -604,14 +535,6 @@
			this.tipMoney = tipMoney;
			}

			public BigDecimal getHolidayFee() {
			return holidayFee;
			}

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

			public BigDecimal getRedPacketMoney() {
			return redPacketMoney;
			}
			@@ -668,30 +591,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;
			}
			@@ -706,14 +605,6 @@

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

			public BigDecimal getThankYouFee() {
			return thankYouFee;
			}

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

			public Integer getState() {
			@@ -812,14 +703,6 @@
			this.isDelete = isDelete;
			}

			public Integer getOldState() {
			return oldState;
			}

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

			public String getTelX() {
			return telX;
			}
			@@ -836,46 +719,6 @@
			this.bindId = bindId;
			}

			public String getPickUpCode() {
			return pickUpCode;
			}

			public void setPickUpCode(String pickUpCode) {
			this.pickUpCode = pickUpCode;
			}

			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 Date getArriveTimeExpect() {
			return arriveTimeExpect;
			}

			public void setArriveTimeExpect(Date arriveTimeExpect) {
			this.arriveTimeExpect = arriveTimeExpect;
			}

			public BigDecimal getTimeOutMoney() {
			return timeOutMoney;
			}

			public void setTimeOutMoney(BigDecimal timeOutMoney) {
			this.timeOutMoney = timeOutMoney;
			}

			@Override
			protected Serializable pkVal() {
			return this.id;
			@@ -884,78 +727,63 @@
			@Override
			public String toString() {
			return "TOrderLogistics{" +
			"id=" + id +
			", type=" + type +
			", userId=" + userId +
			", driverId=" + driverId +
			", carId=" + carId +
			", orderNum=" + orderNum +
			", cargoType=" + cargoType +
			", urgent=" + urgent +
			", cargoNumber=" + cargoNumber +
			", userImg=" + userImg +
			", driverImg=" + driverImg +
			", remark=" + remark +
			", placementLon=" + placementLon +
			", placementLat=" + placementLat +
			", placementAddress=" + placementAddress +
			", startLon=" + startLon +
			", startLat=" + startLat +
			", startAddress=" + startAddress +
			", endLon=" + endLon +
			", endLat=" + endLat +
			", endAddress=" + endAddress +
			", recipient=" + recipient +
			", recipientPhone=" + recipientPhone +
			", boardingLon=" + boardingLon +
			", boardingLat=" + boardingLat +
			", boardingAddress=" + boardingAddress +
			", boardingTime=" + boardingTime +
			", getoffLon=" + getoffLon +
			", getoffLat=" + getoffLat +
			", getoffAddress=" + getoffAddress +
			", getoffTime=" + getoffTime +
			", mileage=" + mileage +
			", payManner=" + payManner +
			", payType=" + payType +
			", orderMoney=" + orderMoney +
			", travelMoney=" + travelMoney +
			", tipMoney=" + tipMoney +
			", 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 +
			", state=" + state +
			", insertTime=" + insertTime +
			", travelTime=" + travelTime +
			", snatchOrderTime=" + snatchOrderTime +
			", setOutTime=" + setOutTime +
			", arriveTime=" + arriveTime +
			", startServiceTime=" + startServiceTime +
			", endServiceTime=" + endServiceTime +
			", orderSource=" + orderSource +
			", invoiceId=" + invoiceId +
			", trackId=" + trackId +
			", isDelete=" + isDelete +
			", oldState=" + oldState +
			", telX=" + telX +
			", bindId=" + bindId +
			", pickUpCode=" + pickUpCode +
			", isReassign=" + isReassign +
			", reassignNotice=" + reassignNotice +
			", arriveTimeExpect=" + arriveTimeExpect +
			", timeOutMoney=" + timeOutMoney +
			"}";
			"id=" + id +
			", type=" + type +
			", userId=" + userId +
			", driverId=" + driverId +
			", carId=" + carId +
			", orderNum=" + orderNum +
			", cargoType=" + cargoType +
			", cargoNumber=" + cargoNumber +
			", remark=" + remark +
			", placementLon=" + placementLon +
			", placementLat=" + placementLat +
			", placementAddress=" + placementAddress +
			", startLon=" + startLon +
			", startLat=" + startLat +
			", startAddress=" + startAddress +
			", endLon=" + endLon +
			", endLat=" + endLat +
			", endAddress=" + endAddress +
			", recipient=" + recipient +
			", recipientPhone=" + recipientPhone +
			", boardingLon=" + boardingLon +
			", boardingLat=" + boardingLat +
			", boardingAddress=" + boardingAddress +
			", boardingTime=" + boardingTime +
			", getoffLon=" + getoffLon +
			", getoffLat=" + getoffLat +
			", getoffAddress=" + getoffAddress +
			", getoffTime=" + getoffTime +
			", mileage=" + mileage +
			", payManner=" + payManner +
			", payType=" + payType +
			", orderMoney=" + orderMoney +
			", travelMoney=" + travelMoney +
			", tipMoney=" + tipMoney +
			", redPacketMoney=" + redPacketMoney +
			", couponMoney=" + couponMoney +
			", redPacketId=" + redPacketId +
			", couponId=" + couponId +
			", discount=" + discount +
			", discountMoney=" + discountMoney +
			", activityId=" + activityId +
			", companyId=" + companyId +
			", payMoney=" + payMoney +
			", state=" + state +
			", insertTime=" + insertTime +
			", travelTime=" + travelTime +
			", snatchOrderTime=" + snatchOrderTime +
			", setOutTime=" + setOutTime +
			", arriveTime=" + arriveTime +
			", startServiceTime=" + startServiceTime +
			", endServiceTime=" + endServiceTime +
			", orderSource=" + orderSource +
			", invoiceId=" + invoiceId +
			", trackId=" + trackId +
			", isDelete=" + isDelete +
			", telX=" + telX +
			", bindId=" + bindId +
			"}";
			}
			}