From 7a9e05846c5e37f7278f242857056d0623532379 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 16 六月 2023 20:17:32 +0800
Subject: [PATCH] 修改bug和功能优化
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java | 16 +++++++++++++---
1 files changed, 13 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 0294c69..ee345a0 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
@@ -166,7 +166,7 @@
* 等待时长（分钟）
*/
@TableField("waitTime")
- private Integer waitTime;
+ private Double waitTime;
/**
* 等待费
*/
@@ -176,7 +176,7 @@
* 超出等待时长（分钟）
*/
@TableField("outWaitTime")
- private Integer outWaitTime;
+ private Double 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;
@@ -263,6 +268,11 @@
@TableField("payTime")
private Date payTime;
/**
+ * 账户余额支付金额
+ */
+ @TableField("balancePayment")
+ private Double balancePayment;
+ /**
* 第三方支付流水号
*/
@TableField("orderNo")
--
Gitblit v1.7.1