From eb98fdac45ce52c592a32c862423ef139faf2bce Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期三, 20 五月 2026 20:59:30 +0800
Subject: [PATCH] 修复问题
---
app/src/main/java/com/driver/igotrip/bean/OrderBean.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/bean/OrderBean.java b/app/src/main/java/com/driver/igotrip/bean/OrderBean.java
index da09e56..b10dd7a 100644
--- a/app/src/main/java/com/driver/igotrip/bean/OrderBean.java
+++ b/app/src/main/java/com/driver/igotrip/bean/OrderBean.java
@@ -48,7 +48,7 @@
this.msg = msg;
}
- public static class OrderPositionListBean{
+ public static class OrderPositionListBean {
private Double altitude;
private Double directionAngle;
private int driverId;
@@ -160,7 +160,7 @@
private String nickName;
private String userName;
private int orderId;
- private double orderMoney;
+ private double orderMoney;
private String orderName;
private int orderState; //1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付
private int payManner;
@@ -192,7 +192,7 @@
private String differenceMoney;
private String driverPay; //1待支付 2已支付
-// private List<OrderPositionListBean> orderPositionList;
+ // private List<OrderPositionListBean> orderPositionList;
private String orderPositionList;
private Long timeOutCancel; // 超时取消时间 分钟
private int cancelMidway; // 中途取消（0=否，1=是）
@@ -226,10 +226,11 @@
}
public List<OrderPositionListBean> getOrderPositionList() {
- if (orderPositionList == null || orderPositionList.isEmpty()){
+ if (orderPositionList == null || orderPositionList.isEmpty()) {
return new ArrayList<>();
- }else {
- return new Gson().fromJson(orderPositionList,new TypeToken<List<OrderPositionListBean>>(){}.getType());
+ } else {
+ return new Gson().fromJson(orderPositionList, new TypeToken<List<OrderPositionListBean>>() {
+ }.getType());
}
}
@@ -529,10 +530,12 @@
return driverPay.equals("1") ? context.getString(R.string.列表待支付) : context.getString(R.string.待评价);
case 9:
if (driverPay.equals("1")) {
- if (cancelMidway == 1) return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.列表待支付);
+ if (cancelMidway == 1)
+ return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.列表待支付);
return context.getString(R.string.列表待支付);
} else {
- if (cancelMidway == 1) return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.已完成);
+ if (cancelMidway == 1)
+ return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.已完成);
else return context.getString(R.string.已完成);
}
case 10:
@@ -560,12 +563,14 @@
case 6:
return context.getString(R.string.已送达);
case 7:
- if (cancelMidway == 1) return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.列表待支付);
+ if (cancelMidway == 1)
+ return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.列表待支付);
return context.getString(R.string.列表待支付);
case 8:
return context.getString(R.string.待评价);
case 9:
- if (cancelMidway == 1) return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.已完成);
+ if (cancelMidway == 1)
+ return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.已完成);
else return context.getString(R.string.已完成);
case 10:
return context.getString(R.string.cancel_ed);
@@ -635,5 +640,18 @@
public void setTravelTime(String travelTime) {
this.travelTime = travelTime;
}
+
+ /**
+ * 获取快件总支付金额
+ */
+ public double getExpressPayAllMoney() {
+ double value = payMoney == null ? 0 : payMoney;
+ try {
+ return value + Double.parseDouble(differenceMoney);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return value;
+ }
}
}
--
Gitblit v1.7.1