From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
index 282b2ca..b2dd8d6 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -155,7 +155,7 @@
@TableField("payManner")
private Integer payManner;
/**
- * 支付方式（1=微信，2=支付宝，3=余额）
+ * 支付方式（1=手机支付，2=银行卡支付，3=余额，4=现金支付）
*/
@TableField("payType")
private Integer payType;
@@ -382,6 +382,12 @@
private BigDecimal freeMoney;
private Integer isplatPay;
+ /**
+ * 司机支付状态（现金支付司机代支付）1待支付 2已支付
+ * @return
+ */
+ @TableField("driverPay")
+ private Integer driverPay;
public Integer getIsplatPay() {
return isplatPay;
@@ -974,6 +980,14 @@
this.bindId = bindId;
}
+ public Integer getDriverPay() {
+ return driverPay;
+ }
+
+ public void setDriverPay(Integer driverPay) {
+ this.driverPay = driverPay;
+ }
+
@Override
public String toString() {
return "OrderPrivateCar{" +
--
Gitblit v1.7.1