From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java |  181 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 172 insertions(+), 9 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
index 380e941..7ebc08a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
@@ -1,11 +1,14 @@
 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;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -16,6 +19,7 @@
  * @author 吕雪
  * @since 2020-09-02
  */
+@Data
 @TableName("t_order_private_car")
 public class TOrderPrivateCar extends Model<TOrderPrivateCar> {
 
@@ -30,6 +34,38 @@
      * 类型（1=普通订单，2=摆渡订单）
      */
     private Integer type;
+    private String remark;
+    @TableField("startMileage")
+    private Double startMileage;
+
+    private Integer startDuration;
+    @TableField("duration")
+    private Double duration;
+    @TableField("wait")
+    private Double wait;
+    @TableField("longDistance")
+    private Double longDistance;
+
+    @TableField("mileageKilometers")
+    private Double mileageKilometers;
+
+    private BigDecimal freeMoney;
+    @TableField("isFree")
+    private Integer isFree;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * 用户id
      */
@@ -132,7 +168,8 @@
     private BigDecimal orderMoney;
 
     private Double waitMoney;
-
+    private Integer moneyType;
+    private String moneyTime;
     /**
      * 起步价
      */
@@ -168,7 +205,7 @@
     /**
      * 红包记录id
      */
-    private Integer redPacketId;
+    private String redPacketId;
     /**
      * 优惠券id
      */
@@ -287,6 +324,18 @@
     private BigDecimal abnormalMoney;
 
     private Integer isFrozen;
+    
+    private String tripId;
+    /**
+     * google行程结束标识-是否结束（0=否，1=是）
+     */
+    @TableField("isover")
+    private Integer isover;
+    /**
+     * 争议订单（0=否，1=是）
+     */
+    @TableField("isDispute")
+    private Integer isDispute;
 
     public Integer getIsFrozen() {
         return isFrozen;
@@ -600,13 +649,7 @@
         this.couponMoney = couponMoney;
     }
 
-    public Integer getRedPacketId() {
-        return redPacketId;
-    }
 
-    public void setRedPacketId(Integer redPacketId) {
-        this.redPacketId = redPacketId;
-    }
 
     public Integer getCouponId() {
         return couponId;
@@ -831,7 +874,127 @@
     public void setServerCarModelId(Integer serverCarModelId) {
         this.serverCarModelId = serverCarModelId;
     }
-
+    
+    public String getRemark() {
+        return remark;
+    }
+    
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    
+    public String getTripId() {
+        return tripId;
+    }
+    
+    public void setTripId(String tripId) {
+        this.tripId = tripId;
+    }
+    
+    public Double getStartMileage() {
+        return startMileage;
+    }
+    
+    public void setStartMileage(Double startMileage) {
+        this.startMileage = startMileage;
+    }
+    
+    public Integer getStartDuration() {
+        return startDuration;
+    }
+    
+    public void setStartDuration(Integer startDuration) {
+        this.startDuration = startDuration;
+    }
+    
+    public Double getDuration() {
+        return duration;
+    }
+    
+    public void setDuration(Double duration) {
+        this.duration = duration;
+    }
+    
+    public Double getWait() {
+        return wait;
+    }
+    
+    public void setWait(Double wait) {
+        this.wait = wait;
+    }
+    
+    public Double getLongDistance() {
+        return longDistance;
+    }
+    
+    public void setLongDistance(Double longDistance) {
+        this.longDistance = longDistance;
+    }
+    
+    public Double getMileageKilometers() {
+        return mileageKilometers;
+    }
+    
+    public void setMileageKilometers(Double mileageKilometers) {
+        this.mileageKilometers = mileageKilometers;
+    }
+    
+    public Integer getMoneyType() {
+        return moneyType;
+    }
+    
+    public void setMoneyType(Integer moneyType) {
+        this.moneyType = moneyType;
+    }
+    
+    public String getMoneyTime() {
+        return moneyTime;
+    }
+    
+    public void setMoneyTime(String moneyTime) {
+        this.moneyTime = moneyTime;
+    }
+    
+    public String getRedPacketId() {
+        return redPacketId;
+    }
+    
+    public void setRedPacketId(String redPacketId) {
+        this.redPacketId = redPacketId;
+    }
+    
+    public Integer getIsDispute() {
+        return isDispute;
+    }
+    
+    public void setIsDispute(Integer isDispute) {
+        this.isDispute = isDispute;
+    }
+    
+    public BigDecimal getFreeMoney() {
+        return freeMoney;
+    }
+    
+    public void setFreeMoney(BigDecimal freeMoney) {
+        this.freeMoney = freeMoney;
+    }
+    
+    public Integer getIsFree() {
+        return isFree;
+    }
+    
+    public void setIsFree(Integer isFree) {
+        this.isFree = isFree;
+    }
+    
+    public Integer getIsover() {
+        return isover;
+    }
+    
+    public void setIsover(Integer isover) {
+        this.isover = isover;
+    }
+    
     @Override
     protected Serializable pkVal() {
         return this.id;

--
Gitblit v1.7.1