From 19fa90abbc2043b73bef3992428d912d011fc8c5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 09:59:49 +0800
Subject: [PATCH] 合并代码
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
index 56f7a1c..7c5e6b9 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
@@ -163,7 +163,7 @@
@TableField("overLongDistancePrice")
private Double overLongDistancePrice;
/**
- * 等待时长（分钟）
+ * 等待时长（s）
*/
@TableField("waitTime")
private Integer waitTime;
@@ -173,7 +173,7 @@
@TableField("waitTimePrice")
private Double waitTimePrice;
/**
- * 超出等待时长（分钟）
+ * 超出等待时长（s）
*/
@TableField("outWaitTime")
private Integer outWaitTime;
@@ -268,10 +268,25 @@
@TableField("payTime")
private Date payTime;
/**
+ * 微信支付金额
+ */
+ @TableField("weChatPayment")
+ private Double weChatPayment;
+ /**
* 账户余额支付金额
*/
@TableField("balancePayment")
private Double balancePayment;
+ /**
+ * 微信支付剩余未分账金额
+ */
+ @TableField("residueWeChatPayment")
+ private Double residueWeChatPayment;
+ /**
+ * 余额支付剩余未分账金额
+ */
+ @TableField("residueBalancePayment")
+ private Double residueBalancePayment;
/**
* 第三方支付流水号
*/
@@ -312,4 +327,9 @@
*/
@TableField("createTime")
private Date createTime;
+ /**
+ * 节假日费
+ */
+ @TableField("holidayPrice")
+ private Double holidayPrice;
}
--
Gitblit v1.7.1