修改bug

Pu Zhibing

20 小时以前 f72ae151cc12b219cb5f39eea3ec0ea089a6ef2a

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java

@@ -367,6 +367,7 @@
    private Integer invoiceId;
    /**
     * 是否是改派单（1=否，=是）
     *
     * @return
     */
    @TableField("isReassign")
@@ -378,6 +379,7 @@
    private Integer reassignNotice;
    /**
     * 高德猎鹰轨迹id
     *
     * @return
     */
    @TableField("trackId")
@@ -389,18 +391,21 @@
    private Integer isDelete;
    /**
     * 该派前的订单状态
     *
     * @return
     */
    @TableField("oldState")
    private Integer oldState;
    /**
     * 移动小号
     *
     * @return
     */
    @TableField("telX")
    private String telX;
    /**
     * 绑定小号关系id
     *
     * @return
     */
    @TableField("bindId")
@@ -426,7 +431,6 @@
    private Integer abnormal;



    /**
     * 推广订单 1否 2是
     */
@@ -434,6 +438,7 @@
    private Integer promotion;


    private Date successTime;
    private String promotionUser;

    private String promotionPhone;
@@ -457,7 +462,6 @@
    private BigDecimal promotionMoney;



    private Integer totalPeopleNum;
    /**
     * 预估里程(米)
@@ -471,6 +475,48 @@
    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;
@@ -1232,6 +1278,102 @@
        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{" +
@@ -1240,6 +1382,7 @@
                ", crossCityOrderId=" + crossCityOrderId +
                ", place=" + place +
                ", userId=" + userId +
                ", serverCarModel='" + serverCarModel + '\'' +
                ", serverCarModelId=" + serverCarModelId +
                ", driverId=" + driverId +
                ", carId=" + carId +
@@ -1277,6 +1420,7 @@
                ", longDistanceMoney=" + longDistanceMoney +
                ", parkMoney=" + parkMoney +
                ", roadTollMoney=" + roadTollMoney +
                ", holidayFee=" + holidayFee +
                ", redPacketMoney=" + redPacketMoney +
                ", couponMoney=" + couponMoney +
                ", redPacketId=" + redPacketId +
@@ -1284,8 +1428,12 @@
                ", discount=" + discount +
                ", discountMoney=" + discountMoney +
                ", activityId=" + activityId +
                ", taxiCardId=" + taxiCardId +
                ", userTaxiCardId=" + userTaxiCardId +
                ", discountAmount=" + discountAmount +
                ", companyId=" + companyId +
                ", payMoney=" + payMoney +
                ", thankYouFee=" + thankYouFee +
                ", substitute=" + substitute +
                ", passengers='" + passengers + '\'' +
                ", passengersPhone='" + passengersPhone + '\'' +
@@ -1307,6 +1455,27 @@
                ", 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 +
                '}';
    }
}