From c18ec3846c8483975de2224c1ecac9470e9b2804 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 19:21:36 +0800
Subject: [PATCH] 同步代码
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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 4aa6a66..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;
@@ -258,7 +258,7 @@
@TableField("discount")
private Double discount;
/**
- * 支付类型（1=微信支付，2=余额支付,3=线下支付）
+ * 支付类型（1=微信支付，2=余额支付,3=线下支付,4=微信+余额）
*/
@TableField("payType")
private Integer payType;
@@ -267,6 +267,26 @@
*/
@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;
/**
* 第三方支付流水号
*/
@@ -307,4 +327,9 @@
*/
@TableField("createTime")
private Date createTime;
+ /**
+ * 节假日费
+ */
+ @TableField("holidayPrice")
+ private Double holidayPrice;
}
--
Gitblit v1.7.1