From 13d2bd6a27f941cfd8f096a7ae2def858a565363 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:01:34 +0800
Subject: [PATCH] 修改2.0 bug

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java |   99 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 89 insertions(+), 10 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 5429df0..d0e9eb9 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
@@ -49,9 +49,9 @@
     @TableField("mileageKilometers")
     private Double mileageKilometers;
 
-
-
-
+    private BigDecimal freeMoney;
+    @TableField("isFree")
+    private Integer isFree;
 
 
 
@@ -205,7 +205,7 @@
     /**
      * 红包记录id
      */
-    private Integer redPacketId;
+    private String redPacketId;
     /**
      * 优惠券id
      */
@@ -326,6 +326,11 @@
     private Integer isFrozen;
     
     private String tripId;
+    /**
+     * 争议订单（0=否，1=是）
+     */
+    @TableField("isDispute")
+    private Integer isDispute;
 
     public Integer getIsFrozen() {
         return isFrozen;
@@ -639,13 +644,7 @@
         this.couponMoney = couponMoney;
     }
 
-    public Integer getRedPacketId() {
-        return redPacketId;
-    }
 
-    public void setRedPacketId(Integer redPacketId) {
-        this.redPacketId = redPacketId;
-    }
 
     public Integer getCouponId() {
         return couponId;
@@ -887,6 +886,86 @@
         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;
+    }
+    
     @Override
     protected Serializable pkVal() {
         return this.id;

--
Gitblit v1.7.1