From 62a5ff043d7bca49dceebf7e6ddfeb8ffadad422 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期五, 10 四月 2026 16:09:14 +0800
Subject: [PATCH] 优化小程序订单听单逻辑
---
app/src/main/java/com/jxonlinecar/driver/bean/OrderBean.java | 379 -----------------------------------------------------
1 files changed, 3 insertions(+), 376 deletions(-)
diff --git a/app/src/main/java/com/jxonlinecar/driver/bean/OrderBean.java b/app/src/main/java/com/jxonlinecar/driver/bean/OrderBean.java
index 6951936..104aa38 100644
--- a/app/src/main/java/com/jxonlinecar/driver/bean/OrderBean.java
+++ b/app/src/main/java/com/jxonlinecar/driver/bean/OrderBean.java
@@ -9,7 +9,7 @@
*/
private Integer code;
- private DataBean data;
+ private OrderInfo data;
private String msg;
private Long time = 0L; //收到订单时长
@@ -39,11 +39,11 @@
this.code = code;
}
- public DataBean getData() {
+ public OrderInfo getData() {
return data;
}
- public void setData(DataBean data) {
+ public void setData(OrderInfo data) {
this.data = data;
}
@@ -53,378 +53,5 @@
public void setMsg(String msg) {
this.msg = msg;
- }
-
- public static class DataBean {
- /**
- * endAddress : string
- * endLat : string
- * endLon : string
- * historyNum : 0
- * nickName : string
- * orderId : 0
- * orderName : string
- * orderState : 0
- * phone : string
- * startAddress : string
- * startDistance : 0
- * startLat : string
- * startLon : string
- * tipMoney : 0
- * totalDistance : 0
- * travelTime : string
- */
-
- private String endAddress;
- private String endLat;
- private String endLon;
- private Integer historyNum;
- private Integer isReassign;
- private String nickName;
- private Integer orderId;
- private Double orderMoney;
- private String orderName;
- private Integer orderState;
- private Integer payManner;
- private String phone;
- private String startAddress;
- private Double startDistance;
- private Double startLat;
- private Double startLon;
- private Double tipMoney;
- private Double totalDistance;
- private String travelTime;
- private String travelTime_;
- public String trackId;
- public String arriveTime;
- private Integer reservation;
- private String type;
- private String emergencyCall;
-
- private String cancelReason;
- private String cancelRemark;
- private Double cancelPayMoney;
- private String cancelUser;
- private String remark;
- private String peopleNumber = "-1";
- private String seatNumber;
- private String payMoney;
- private String cargoType; //1:普通 2：贵重
- private String differenceMoney;
- public String audioLinkUrl;
-
- public String getDifferenceMoney() {
- return differenceMoney;
- }
-
- public void setDifferenceMoney(String differenceMoney) {
- this.differenceMoney = differenceMoney;
- }
-
- public String getCargoType() {
- return cargoType;
- }
-
- public void setCargoType(String cargoType) {
- this.cargoType = cargoType;
- }
-
- public String getPayMoney() {
- return payMoney;
- }
-
- public void setPayMoney(String payMoney) {
- this.payMoney = payMoney;
- }
-
- public String getPeopleNumber() {
- return peopleNumber;
- }
-
- public void setPeopleNumber(String peopleNumber) {
- this.peopleNumber = peopleNumber;
- }
-
- public String getSeatNumber() {
- return seatNumber;
- }
-
- public void setSeatNumber(String seatNumber) {
- this.seatNumber = seatNumber;
- }
-
- public String getPeople() {
- return peopleNumber;
- }
-
- public void setPeople(String people) {
- this.peopleNumber = people;
- }
-
- private Integer reassign;
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getReassign() {
- return reassign;
- }
-
- public void setReassign(Integer reassign) {
- this.reassign = reassign;
- }
-
- public String getCancelReason() {
- return cancelReason;
- }
-
- public void setCancelReason(String cancelReason) {
- this.cancelReason = cancelReason;
- }
-
- public String getCancelRemark() {
- return cancelRemark;
- }
-
- public void setCancelRemark(String cancelRemark) {
- this.cancelRemark = cancelRemark;
- }
-
- public Double getCancelPayMoney() {
- return cancelPayMoney;
- }
-
- public void setCancelPayMoney(Double cancelPayMoney) {
- this.cancelPayMoney = cancelPayMoney;
- }
-
- public String getCancelUser() {
- return cancelUser;
- }
-
- public void setCancelUser(String cancelUser) {
- this.cancelUser = cancelUser;
- }
-
- public String getTravelTime_() {
- return travelTime_;
- }
-
- public void setTravelTime_(String travelTime_) {
- this.travelTime_ = travelTime_;
- }
-
- public String getEmergencyCall() {
- return emergencyCall;
- }
-
- public void setEmergencyCall(String emergencyCall) {
- this.emergencyCall = emergencyCall;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public Integer getReservation() {
- return reservation;
- }
-
- public void setReservation(Integer reservation) {
- this.reservation = reservation;
- }
-
- public String getArriveTime() {
- return arriveTime;
- }
-
- public void setArriveTime(String arriveTime) {
- this.arriveTime = arriveTime;
- }
-
- public String getWaitTime() {
- return arriveTime;
- }
-
- public void setWaitTime(String waitTime) {
- this.arriveTime = waitTime;
- }
-
- public Double getOrderMoney() {
- return orderMoney;
- }
-
- public void setOrderMoney(Double orderMoney) {
- this.orderMoney = orderMoney;
- }
-
- public Integer getPayManner() {
- return payManner;
- }
-
- public void setPayManner(Integer payManner) {
- this.payManner = payManner;
- }
-
- public String getTrackId() {
- return trackId;
- }
-
- public void setTrackId(String trackId) {
- this.trackId = trackId;
- }
-
- public Integer getIsReassign() {
- return isReassign;
- }
-
- public void setIsReassign(Integer isReassign) {
- this.isReassign = isReassign;
- }
-
- public String getEndAddress() {
- return endAddress;
- }
-
- public void setEndAddress(String endAddress) {
- this.endAddress = endAddress;
- }
-
- public Double getEndLat() {
- if (endLat.isEmpty()){
- return null;
- }else {
- return Double.valueOf(endLat);
- }
- }
-
- public void setEndLat(Double endLat) {
- this.endLat = endLat.toString();
- }
-
- public Double getEndLon() {
- if (endLon.isEmpty()){
- return null;
- }else {
- return Double.valueOf(endLon);
- }
- }
-
- public void setEndLon(Double endLon) {
- this.endLon = endLon.toString();
- }
-
- public void setStartLat(Double startLat) {
- this.startLat = startLat;
- }
-
- public void setStartLon(Double startLon) {
- this.startLon = startLon;
- }
-
- public Integer getHistoryNum() {
- return historyNum;
- }
-
- public void setHistoryNum(Integer historyNum) {
- this.historyNum = historyNum;
- }
-
- public String getNickName() {
- return nickName;
- }
-
- public void setNickName(String nickName) {
- this.nickName = nickName;
- }
-
- public Integer getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Integer orderId) {
- this.orderId = orderId;
- }
-
- public String getOrderName() {
- return orderName;
- }
-
- public void setOrderName(String orderName) {
- this.orderName = orderName;
- }
-
- public Integer getOrderState() {
- return orderState;
- }
-
- public void setOrderState(Integer orderState) {
- this.orderState = orderState;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getStartAddress() {
- return startAddress;
- }
-
- public void setStartAddress(String startAddress) {
- this.startAddress = startAddress;
- }
-
- public Double getStartDistance() {
- return startDistance;
- }
-
- public void setStartDistance(Double startDistance) {
- this.startDistance = startDistance;
- }
-
- public Double getStartLat() {
- return startLat;
- }
-
- public Double getStartLon() {
- return startLon;
- }
-
- public Double getTipMoney() {
- return tipMoney;
- }
-
- public void setTipMoney(Double tipMoney) {
- this.tipMoney = tipMoney;
- }
-
- public Double getTotalDistance() {
- return totalDistance;
- }
-
- public void setTotalDistance(Double totalDistance) {
- this.totalDistance = totalDistance;
- }
-
- public String getTravelTime() {
- return travelTime;
- }
-
- public void setTravelTime(String travelTime) {
- this.travelTime = travelTime;
- }
}
}
--
Gitblit v1.7.1