From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java | 204 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 192 insertions(+), 12 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 bb5d30e..d80cd40 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,14 +1,15 @@
package com.stylefeng.guns.modular.system.model;
-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.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* <p>
@@ -34,6 +35,36 @@
*/
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
@@ -137,7 +168,8 @@
private BigDecimal orderMoney;
private Double waitMoney;
-
+ private Integer moneyType;
+ private String moneyTime;
/**
* 起步价
*/
@@ -173,7 +205,7 @@
/**
* 红包记录id
*/
- private Integer redPacketId;
+ private String redPacketId;
/**
* 优惠券id
*/
@@ -294,6 +326,32 @@
private Integer isFrozen;
private String tripId;
+ /**
+ * google行程结束标识-是否结束（0=否，1=是）
+ */
+ @TableField("isover")
+ private Integer isover;
+ /**
+ * 争议订单（0=否，1=是）
+ */
+ @TableField("isDispute")
+ private Integer isDispute;
+ /**
+ * 司机预估到达预约单时间
+ */
+ @TableField("estimateArriveTime")
+ private Date estimateArriveTime;
+
+ /**
+ * 司机预估距离预约点距离（米）
+ */
+ @TableField("estimateArriveMileage")
+ private Long estimateArriveMileage;
+ /**
+ * 预估里程
+ */
+ @TableField("estimatedMileage")
+ private Double estimatedMileage;
public Integer getIsFrozen() {
return isFrozen;
@@ -607,13 +665,7 @@
this.couponMoney = couponMoney;
}
- public Integer getRedPacketId() {
- return redPacketId;
- }
- public void setRedPacketId(Integer redPacketId) {
- this.redPacketId = redPacketId;
- }
public Integer getCouponId() {
return couponId;
@@ -855,6 +907,134 @@
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;
+ }
+
+ public Long getEstimateArriveMileage() {
+ return estimateArriveMileage;
+ }
+
+ public void setEstimateArriveMileage(Long estimateArriveMileage) {
+ this.estimateArriveMileage = estimateArriveMileage;
+ }
+
+ public Double getEstimatedMileage() {
+ return estimatedMileage;
+ }
+
+ public void setEstimatedMileage(Double estimatedMileage) {
+ this.estimatedMileage = estimatedMileage;
+ }
+
+ public Date getEstimateArriveTime() {
+ return estimateArriveTime;
+ }
+
+ public void setEstimateArriveTime(Date estimateArriveTime) {
+ this.estimateArriveTime = estimateArriveTime;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1