From e2d01b2009c30173ff8e9f77d5c065f4d38fa49d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:56:07 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 7 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 5891323..4fbb254 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;
/**
* 红包抵扣金额
*/
@@ -204,7 +255,7 @@
* 红包id
*/
@TableField("redPacketId")
- private Integer redPacketId;
+ private String redPacketId;
/**
* 优惠券id
*/
@@ -352,4 +403,22 @@
*/
@TableField("destination")
private String destination;
+ private Integer isplatPay;
+ @TableField(exist = false)
+ private BigDecimal freeMoney;
+ /**
+ * 补差价金额
+ */
+ @TableField("priceDifference")
+ private Double priceDifference;
+ /**
+ * 起步里程
+ */
+ @TableField("startMileage")
+ private Double startMileage;
+ /**
+ * 中途取消（0=否，1=是）
+ */
+ @TableField("cancelMidway")
+ private Integer cancelMidway;
}
--
Gitblit v1.7.1