From 03972ad1d3ce6ffe0be0395c0a4d5dcb4474031f Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 16 六月 2023 15:54:16 +0800
Subject: [PATCH] 修改公费支付方式
---
app/src/main/java/com/kuanzhai/user/network/entity/OrderData.kt | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/kuanzhai/user/network/entity/OrderData.kt b/app/src/main/java/com/kuanzhai/user/network/entity/OrderData.kt
index 68df43f..594d114 100644
--- a/app/src/main/java/com/kuanzhai/user/network/entity/OrderData.kt
+++ b/app/src/main/java/com/kuanzhai/user/network/entity/OrderData.kt
@@ -55,6 +55,9 @@
val startCity: String = "",
val endCity: String = "",
var state: Int = 0, //订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）加个15作为改派成功
+ var auditStatus: Int = -1, //审核状态(-1 其他正常订单 -2取消订单 0待审核 1审核通过 2拒绝)
+ val auditRemark: String = "",
+ val auditUser: String = "",
val time: String = "",
val travelMoney: Double = 0.0,
val roadTollMoney: Double = 0.0,
@@ -76,6 +79,7 @@
val peopleNumber: Int = 0,
val rideType: Int = 0, //乘车类型(1=独享，2=一口价，3=拼车)
val spellSuccess: Int = 0, //拼车'0未成功，1成功'
+ val payWay: Int = 0, //1自费 2企业支付
val seatNumber: String = "",
val fareTypeNote1: String = "",
val fareTypeNote2: String = "",
@@ -115,6 +119,28 @@
else->""
}
+ fun getOfficialStateStr() = when(state){
+ 1->{
+ when(auditStatus){
+ 0->"待处理"
+ 2->"已处理"
+ -2->"已取消"
+ else->"等待应答"
+ }
+ }
+ 2,3->"等待接驾"
+ 4->"等待上车"
+ 5->"服务中"
+ 6->"待确认费用"
+ 7->"待支付"
+ 8->"待评价"
+ 9->"已完成"
+ 10->"已取消"
+ 11->"改派中"
+ 12->"取消待支付"
+ else->""
+ }
+
fun getCharterState() = when(state){
1->"待处理"
2->"已处理"
--
Gitblit v1.7.1