新增加跨城支付

Pu Zhibing

4 天以前 2792ef8f8472732999d4eafeab25d2eb6e2c5bad

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/OrderCrossCity.java

@@ -391,6 +391,40 @@
    private String promotionUser;

    private String promotionPhone;
    /**
     * 中台行程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 String abnormalRemark;

    private BigDecimal responsibilityMoney;

    private String voice;

    private Date voiceTime;

    private Date recoveryOrderCreateDate;

    private Date payTime;

    public String getPromotionUser() {
        return promotionUser;
@@ -1023,6 +1057,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 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 String getAbnormalRemark() {
        return abnormalRemark;
    }

    public void setAbnormalRemark(String abnormalRemark) {
        this.abnormalRemark = abnormalRemark;
    }

    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 "OrderCrossCity{" +