From d5b3e5a413bcfccba294793ee093722f31b2448a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 17:02:13 +0800
Subject: [PATCH] 添加推单日志
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 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 c8afd9d..84b605b 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;
@@ -218,6 +218,11 @@
@TableField("estimatedMileage")
private Double estimatedMileage;
/**
+ * 预估时间
+ */
+ @TableField("estimatedTime")
+ private Integer estimatedTime;
+ /**
* 订单金额
*/
@TableField("orderMoney")
@@ -253,7 +258,7 @@
@TableField("discount")
private Double discount;
/**
- * 支付类型（1=微信支付，2=余额支付,3=线下支付）
+ * 支付类型（1=微信支付，2=余额支付,3=线下支付,4=微信+余额）
*/
@TableField("payType")
private Integer payType;
@@ -262,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;
/**
* 第三方支付流水号
*/
@@ -288,6 +313,11 @@
@TableField("oldState")
private Integer oldState;
/**
+ * 是否已开发票（0=否，1=是）
+ */
+ @TableField("isInvoice")
+ private Integer isInvoice;
+ /**
* 状态（1=正常，2=冻结，3=删除）
*/
@TableField("status")
--
Gitblit v1.7.1