From 0045a8fdf5525a385c233c3b82e42f6120021cac Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 06 五月 2024 17:55:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 80 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
index 1ff1514..ffbc64e 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -40,6 +41,11 @@
*/
@TableField("carId")
private Integer carId;
+ /**
+ * 服务车型id
+ */
+ @TableField("serverCarModelId")
+ private Integer serverCarModelId;
/**
* 订单号
*/
@@ -181,15 +187,60 @@
@TableField("orderMoney")
private Double orderMoney;
/**
- * 行程费
+ * 起步价
*/
- @TableField("travelMoney")
- private Double travelMoney;
+ @TableField("startMoney")
+ private Double startMoney;
/**
- * 小费
+ * 里程公里
*/
- @TableField("tipMoney")
- private Double tipMoney;
+ @TableField("mileageKilometers")
+ private Double mileageKilometers;
+ /**
+ * 里程费
+ */
+ @TableField("mileageMoney")
+ private Double mileageMoney;
+ /**
+ * 时长分钟
+ */
+ @TableField("duration")
+ private Double duration;
+ /**
+ * 时长费
+ */
+ @TableField("durationMoney")
+ private Double durationMoney;
+ /**
+ * 等待分钟
+ */
+ @TableField("wait")
+ private Double wait;
+ /**
+ * 等待费
+ */
+ @TableField("waitMoney")
+ private Double waitMoney;
+ /**
+ * 远途公里
+ */
+ @TableField("longDistance")
+ private Double longDistance;
+ /**
+ * 远途费
+ */
+ @TableField("longDistanceMoney")
+ private Double longDistanceMoney;
+ /**
+ * 停车费
+ */
+ @TableField("parkMoney")
+ private Double parkMoney;
+ /**
+ * 过路费
+ */
+ @TableField("roadTollMoney")
+ private Double roadTollMoney;
/**
* 红包抵扣金额
*/
@@ -352,4 +403,21 @@
*/
@TableField("destination")
private String destination;
+ private Integer isplatPay;
+ private BigDecimal freeMoney;
+ /**
+ * 补差价金额
+ */
+ @TableField("priceDifference")
+ private Double priceDifference;
+ /**
+ * 起步里程
+ */
+ @TableField("startMileage")
+ private Double startMileage;
+ /**
+ * 中途取消（0=否，1=是）
+ */
+ @TableField("cancelMidway")
+ private Integer cancelMidway;
}
--
Gitblit v1.7.1