From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java |  254 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 254 insertions(+), 0 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
index 018d71a..24a1fec 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
@@ -1,5 +1,6 @@
 package com.stylefeng.guns.modular.system.model;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.enums.IdType;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -343,6 +344,115 @@
     private BigDecimal responsibilityMoney;
 
     private String abnormalRemark;
+
+
+    private Integer promotionDriverId;
+
+
+    private BigDecimal promotionMoney;
+
+    private String voice;
+
+    private Date voiceTime;
+
+    /**
+     * 是否异常订单 1否 2是
+     */
+    @TableField("abnormal")
+    private Integer abnormal;
+
+
+    /**
+     * 推广订单 1否 2是
+     */
+    @TableField("promotion")
+    private Integer promotion;
+
+
+    private Date successTime;
+    private String promotionUser;
+
+    private String promotionPhone;
+
+
+    /**
+     * 乘客反馈情况
+     */
+    @TableField("abnormalIntro")
+    private String abnormalIntro;
+
+    /**
+     * 乘客反馈图片
+     */
+    @TableField("abnormalImg")
+    private String abnormalImg;
+
+
+    private Integer totalPeopleNum;
+    /**
+     * 预估里程(米)
+     */
+    private Double estimateMileage;
+
+    private Double estimateTime;
+
+    private Integer spellSuccess;
+
+    private String splitAllocation;
+
+    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;
+
+    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 BigDecimal getPromotionMoney() {
+        return promotionMoney;
+    }
+
+    public void setPromotionMoney(BigDecimal promotionMoney) {
+        this.promotionMoney = promotionMoney;
+    }
+
+    public Integer getPromotionDriverId() {
+        return promotionDriverId;
+    }
+
+    public void setPromotionDriverId(Integer promotionDriverId) {
+        this.promotionDriverId = promotionDriverId;
+    }
 
     public Integer getAbnormalStatus() {
         return abnormalStatus;
@@ -1000,6 +1110,150 @@
         this.bindId = bindId;
     }
 
+    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 getAbnormal() {
+        return abnormal;
+    }
+
+    public void setAbnormal(Integer abnormal) {
+        this.abnormal = abnormal;
+    }
+
+    public Integer getPromotion() {
+        return promotion;
+    }
+
+    public void setPromotion(Integer promotion) {
+        this.promotion = promotion;
+    }
+
+    public Date getSuccessTime() {
+        return successTime;
+    }
+
+    public void setSuccessTime(Date successTime) {
+        this.successTime = successTime;
+    }
+
+    public String getPromotionUser() {
+        return promotionUser;
+    }
+
+    public void setPromotionUser(String promotionUser) {
+        this.promotionUser = promotionUser;
+    }
+
+    public String getPromotionPhone() {
+        return promotionPhone;
+    }
+
+    public void setPromotionPhone(String promotionPhone) {
+        this.promotionPhone = promotionPhone;
+    }
+
+    public String getAbnormalIntro() {
+        return abnormalIntro;
+    }
+
+    public void setAbnormalIntro(String abnormalIntro) {
+        this.abnormalIntro = abnormalIntro;
+    }
+
+    public String getAbnormalImg() {
+        return abnormalImg;
+    }
+
+    public void setAbnormalImg(String abnormalImg) {
+        this.abnormalImg = abnormalImg;
+    }
+
+    public Integer getTotalPeopleNum() {
+        return totalPeopleNum;
+    }
+
+    public void setTotalPeopleNum(Integer totalPeopleNum) {
+        this.totalPeopleNum = totalPeopleNum;
+    }
+
+    public Double getEstimateMileage() {
+        return estimateMileage;
+    }
+
+    public void setEstimateMileage(Double estimateMileage) {
+        this.estimateMileage = estimateMileage;
+    }
+
+    public Double getEstimateTime() {
+        return estimateTime;
+    }
+
+    public void setEstimateTime(Double estimateTime) {
+        this.estimateTime = estimateTime;
+    }
+
+    public Integer getSpellSuccess() {
+        return spellSuccess;
+    }
+
+    public void setSpellSuccess(Integer spellSuccess) {
+        this.spellSuccess = spellSuccess;
+    }
+
+    public String getSplitAllocation() {
+        return splitAllocation;
+    }
+
+    public void setSplitAllocation(String splitAllocation) {
+        this.splitAllocation = splitAllocation;
+    }
+
+    public Long getPromotionActivityId() {
+        return promotionActivityId;
+    }
+
+    public void setPromotionActivityId(Long promotionActivityId) {
+        this.promotionActivityId = promotionActivityId;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;

--
Gitblit v1.7.1