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/TOrderLogistics.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 106 insertions(+), 13 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
index 27b0be7..cc3de3d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
@@ -1,12 +1,15 @@
package com.stylefeng.guns.modular.system.model;
+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;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
/**
* <p>
@@ -17,6 +20,7 @@
* @since 2020-09-24
*/
@TableName("t_order_logistics")
+@Data
public class TOrderLogistics extends Model<TOrderLogistics> {
private static final long serialVersionUID = 1L;
@@ -169,7 +173,7 @@
/**
* 红包记录id
*/
- private Integer redPacketId;
+ private String redPacketId;
/**
* 优惠券id
*/
@@ -254,6 +258,38 @@
* 移动小号绑定关系id
*/
private String bindId;
+
+ private String tripId;
+ /**
+ * google行程结束标识-是否结束（0=否，1=是）
+ */
+ @TableField("isover")
+ private Integer isover;
+ /**
+ * 争议订单（0=否，1=是）
+ */
+ @TableField("isDispute")
+ private Integer isDispute;
+ /**
+ * 服务车型id
+ */
+ @TableField("serverCarModelId")
+ private Integer serverCarModelId;
+ /**
+ * 预估里程
+ */
+ @TableField("estimatedMileage")
+ private Double estimatedMileage;
+ /**
+ * 司机预估到达预约单时间
+ */
+ @TableField("estimateArriveTime")
+ private Date estimateArriveTime;
+ /**
+ * 司机预估距离预约点距离（米）
+ */
+ @TableField("estimateArriveMileage")
+ private Long estimateArriveMileage;
public Integer getOldState() {
return oldState;
@@ -551,13 +587,6 @@
this.couponMoney = couponMoney;
}
- public Integer getRedPacketId() {
- return redPacketId;
- }
-
- public void setRedPacketId(Integer redPacketId) {
- this.redPacketId = redPacketId;
- }
public Integer getCouponId() {
return couponId;
@@ -718,7 +747,71 @@
public void setBindId(String bindId) {
this.bindId = bindId;
}
-
+
+ public String getTripId() {
+ return tripId;
+ }
+
+ public void setTripId(String tripId) {
+ this.tripId = tripId;
+ }
+
+ 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 Integer getIsover() {
+ return isover;
+ }
+
+ public void setIsover(Integer isover) {
+ this.isover = isover;
+ }
+
+ public Integer getServerCarModelId() {
+ return serverCarModelId;
+ }
+
+ public void setServerCarModelId(Integer serverCarModelId) {
+ this.serverCarModelId = serverCarModelId;
+ }
+
+ 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;
+ }
+
+ public Long getEstimateArriveMileage() {
+ return estimateArriveMileage;
+ }
+
+ public void setEstimateArriveMileage(Long estimateArriveMileage) {
+ this.estimateArriveMileage = estimateArriveMileage;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1