From 7ee9bc8fb2e42ce2e82cd1eacb57ba584611dfc5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 六月 2023 11:04:32 +0800
Subject: [PATCH] 修改bug
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 ee345a0..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,20 +163,20 @@
@TableField("overLongDistancePrice")
private Double overLongDistancePrice;
/**
- * 等待时长（分钟）
+ * 等待时长（s）
*/
@TableField("waitTime")
- private Double waitTime;
+ private Integer waitTime;
/**
* 等待费
*/
@TableField("waitTimePrice")
private Double waitTimePrice;
/**
- * 超出等待时长（分钟）
+ * 超出等待时长（s）
*/
@TableField("outWaitTime")
- private Double outWaitTime;
+ private Integer outWaitTime;
/**
* 超出等待时长费
*/
@@ -268,11 +268,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;
+ /**
* 第三方支付流水号
*/
@TableField("orderNo")
--
Gitblit v1.7.1