From 0fb44d953ab25a53d228b4c1f9381df80e70ee03 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 21 六月 2021 15:32:23 +0800
Subject: [PATCH] 1。4:处理预约单导致串单的问题 隐藏预约单
---
app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt b/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
index ec84a09..b2fab44 100644
--- a/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
+++ b/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
@@ -146,19 +146,20 @@
if (bean.startTime <= 0L) {
if (NetUtils.isNetworkConnected(MyApplication.getInstance())){
CacheKey.saveLocalOrderBeanNull()
- MyApplication.currentOrderId = ""
+ toast("调用正常结束，在异常订单中")
callEndOrder(contexts,bean.money)
}
}else{
if (NetUtils.isNetworkConnected(MyApplication.getInstance())){
- CacheKey.saveLocalOrderBeanNull()
- MyApplication.currentOrderId = ""
val map = getMapByAny()
map["orderId"] = bean.orderId
map["orderType"] = bean.orderType
map["type"] = "1"
map["travelFee"] = bean.money
+ CacheKey.saveLocalOrderBeanNull()
+ toast("调用异常结束，在异常订单中 id==="+bean.orderId)
callNet(contexts, "api/order/confirmFees$", map,{
+ MyApplication.currentOrderId = ""
toast("上传异常订单成功")
EventBus.getDefault().post(BaseEvent(BaseEvent.ERROR_INFO))
}) {
@@ -167,7 +168,6 @@
}
}
}
-
}
}
@@ -203,9 +203,11 @@
mapOrder["orderType"] = MyApplication.currentOrderType
callNet(contexts, Api.queryOrderInfo, mapOrder) {
var orderBean = Gson().fromJson(it, OrderBean::class.java)
+ EventBus.getDefault().post(BaseEvent(BaseEvent.UPDATA_MAIN_CAR))
if (orderBean.data.orderState == 7){
EventBus.getDefault().post(BaseEvent(BaseEvent.SURE_MONEY))
}
+ MyApplication.currentOrderId = ""
if (orderBean.data.orderState == 2 ||orderBean.data.orderState == 3 || orderBean.data.orderState == 4 ){
Handler(Looper.getMainLooper()).postDelayed({
toast("发送网约")
--
Gitblit v1.7.1