From b2eda32b99ddc336372f1cd601d4df23d5f729a8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java | 500 +++----------------------------------------------------
1 files changed, 28 insertions(+), 472 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java
index 2cd144c..82571d5 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java
@@ -2,488 +2,44 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.util.Map;
+@Data
@ApiModel("订单详情")
public class OrderInfoWarpper {
@ApiModelProperty("订单id")
- private Integer orderId;
- @ApiModelProperty("1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中)<br/>" +
- "小件物流订单状态（状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=已支付差价)）")
- private Integer orderState;
- @ApiModelProperty("订单名称")
- private String orderName;
- @ApiModelProperty("出行时间")
- private String travelTime;
- @ApiModelProperty("出行时间")
- private String travelTime_;
- @ApiModelProperty("到达预约点时间")
- private String arriveTime;
- @ApiModelProperty("起点")
+ private Long orderId;
+ @ApiModelProperty("订单编号")
+ private String code;
+ @ApiModelProperty("起点地址")
private String startAddress;
- @ApiModelProperty("终点")
- private String endAddress;
- @ApiModelProperty("红包")
- private Double tipMoney;
- @ApiModelProperty("司机当前位置到起点距离（公里）")
- private Double startDistance;
- @ApiModelProperty("全程公里数")
- private Double totalDistance;
- @ApiModelProperty("起点经度")
- private String startLon;
@ApiModelProperty("起点纬度")
private String startLat;
- @ApiModelProperty("终点经度")
- private String endLon;
+ @ApiModelProperty("起点经度")
+ private String startLng;
+ @ApiModelProperty("终点地址")
+ private String endAddress;
@ApiModelProperty("终点纬度")
private String endLat;
- @ApiModelProperty("乘客昵称")
- private String nickName;
- @ApiModelProperty("乘客电话")
- private String phone;
- @ApiModelProperty("乘客历史乘车次数")
- private Integer historyNum;
- @ApiModelProperty("订单总金额")
- private Double orderMoney;
- @ApiModelProperty("支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））")
- private Integer payManner;
- @ApiModelProperty("支付金额")
- private Double payMoney;
- @ApiModelProperty("差价金额")
- private Double differenceMoney;
- @ApiModelProperty("是否是改派单（1=否，2=是）")
- private Integer isReassign;
- @ApiModelProperty("高德猎鹰轨迹id(订单开始后需要上传坐标到指定轨迹中)")
- private String trackId;
- @ApiModelProperty("是否是预约单（1=否，2=是）")
- private Integer reservation;
- @ApiModelProperty("订单类型（乘客下单，调度下单，改派，预约）")
- private String type;
- @ApiModelProperty("报警电话")
- private String emergencyCall;
- @ApiModelProperty("取消原因")
- private String cancelReason;
- @ApiModelProperty("取消备注")
- private String cancelRemark;
- @ApiModelProperty("取消支付金额")
- private Double cancelPayMoney;
- @ApiModelProperty("取消方")
- private String cancelUser;
- @ApiModelProperty("能否改派（1=否，2=是）")
- private Integer reassign;
- @ApiModelProperty("备注")
- private String remark;
- @ApiModelProperty("乘车人数")
- private Integer peopleNumber;
- @ApiModelProperty("座位号")
- private String seatNumber;
- @ApiModelProperty("货物类型（1=普通货物，2=贵重货物）")
- private Integer cargoType;
- @ApiModelProperty("是否加急（1=否，2=是）")
- private Integer urgent;
- @ApiModelProperty("下单用户姓名")
- private String userName;
- @ApiModelProperty("订单来源（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单，6：道行龙城，7：智慧屏）")
- private Integer orderSource;
-
- public Integer getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Integer orderId) {
- this.orderId = orderId;
- }
-
- public Integer getOrderState() {
- return orderState;
- }
-
- public void setOrderState(Integer orderState) {
- this.orderState = orderState;
- }
-
- public String getOrderName() {
- return orderName;
- }
-
- public void setOrderName(String orderName) {
- this.orderName = orderName;
- }
-
- public String getTravelTime() {
- return travelTime;
- }
-
- public void setTravelTime(String travelTime) {
- this.travelTime = travelTime;
- }
-
- public String getStartAddress() {
- return startAddress;
- }
-
- public void setStartAddress(String startAddress) {
- this.startAddress = startAddress;
- }
-
- public String getEndAddress() {
- return endAddress;
- }
-
- public void setEndAddress(String endAddress) {
- this.endAddress = endAddress;
- }
-
- public Double getTipMoney() {
- return tipMoney;
- }
-
- public void setTipMoney(Double tipMoney) {
- this.tipMoney = tipMoney;
- }
-
- public Double getStartDistance() {
- return startDistance;
- }
-
- public void setStartDistance(Double startDistance) {
- this.startDistance = startDistance;
- }
-
- public Double getTotalDistance() {
- return totalDistance;
- }
-
- public void setTotalDistance(Double totalDistance) {
- this.totalDistance = totalDistance;
- }
-
- public String getStartLon() {
- return startLon;
- }
-
- public void setStartLon(String startLon) {
- this.startLon = startLon;
- }
-
- public String getStartLat() {
- return startLat;
- }
-
- public void setStartLat(String startLat) {
- this.startLat = startLat;
- }
-
- public String getEndLon() {
- return endLon;
- }
-
- public void setEndLon(String endLon) {
- this.endLon = endLon;
- }
-
- public String getEndLat() {
- return endLat;
- }
-
- public void setEndLat(String endLat) {
- this.endLat = endLat;
- }
-
- public String getNickName() {
- return nickName;
- }
-
- public void setNickName(String nickName) {
- this.nickName = nickName;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public Integer getHistoryNum() {
- return historyNum;
- }
-
- public void setHistoryNum(Integer historyNum) {
- this.historyNum = historyNum;
- }
-
- 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 Double getPayMoney() {
- return payMoney;
- }
-
- public void setPayMoney(Double payMoney) {
- this.payMoney = payMoney;
- }
-
- public Integer getIsReassign() {
- return isReassign;
- }
-
- public void setIsReassign(Integer isReassign) {
- this.isReassign = isReassign;
- }
-
- public String getTrackId() {
- return trackId;
- }
-
- public void setTrackId(String trackId) {
- this.trackId = trackId;
- }
-
- public String getArriveTime() {
- return arriveTime;
- }
-
- public void setArriveTime(String arriveTime) {
- this.arriveTime = arriveTime;
- }
-
- public Integer getReservation() {
- return reservation;
- }
-
- public void setReservation(Integer reservation) {
- this.reservation = reservation;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getEmergencyCall() {
- return emergencyCall;
- }
-
- public void setEmergencyCall(String emergencyCall) {
- this.emergencyCall = emergencyCall;
- }
-
- public String getTravelTime_() {
- return travelTime_;
- }
-
- public void setTravelTime_(String travelTime_) {
- this.travelTime_ = travelTime_;
- }
-
- 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 Integer getReassign() {
- return reassign;
- }
-
- public void setReassign(Integer reassign) {
- this.reassign = reassign;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getPeopleNumber() {
- return peopleNumber;
- }
-
- public void setPeopleNumber(Integer peopleNumber) {
- this.peopleNumber = peopleNumber;
- }
-
- public String getSeatNumber() {
- return seatNumber;
- }
-
- public void setSeatNumber(String seatNumber) {
- this.seatNumber = seatNumber;
- }
-
- public Integer getCargoType() {
- return cargoType;
- }
-
- public void setCargoType(Integer cargoType) {
- this.cargoType = cargoType;
- }
-
- public Integer getUrgent() {
- return urgent;
- }
-
- public void setUrgent(Integer urgent) {
- this.urgent = urgent;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public Double getDifferenceMoney() {
- return differenceMoney;
- }
-
- public void setDifferenceMoney(Double differenceMoney) {
- this.differenceMoney = differenceMoney;
- }
-
- public Integer getOrderSource() {
- return orderSource;
- }
-
- public void setOrderSource(Integer orderSource) {
- this.orderSource = orderSource;
- }
-
- @Override
- public String toString() {
- return "OrderInfoWarpper{" +
- "orderId=" + orderId +
- ", orderState=" + orderState +
- ", orderName='" + orderName + '\'' +
- ", travelTime='" + travelTime + '\'' +
- ", travelTime_='" + travelTime_ + '\'' +
- ", arriveTime='" + arriveTime + '\'' +
- ", startAddress='" + startAddress + '\'' +
- ", endAddress='" + endAddress + '\'' +
- ", tipMoney=" + tipMoney +
- ", startDistance=" + startDistance +
- ", totalDistance=" + totalDistance +
- ", startLon='" + startLon + '\'' +
- ", startLat='" + startLat + '\'' +
- ", endLon='" + endLon + '\'' +
- ", endLat='" + endLat + '\'' +
- ", nickName='" + nickName + '\'' +
- ", phone='" + phone + '\'' +
- ", historyNum=" + historyNum +
- ", orderMoney=" + orderMoney +
- ", payManner=" + payManner +
- ", payMoney=" + payMoney +
- ", isReassign=" + isReassign +
- ", trackId='" + trackId + '\'' +
- ", reservation=" + reservation +
- ", type='" + type + '\'' +
- ", emergencyCall='" + emergencyCall + '\'' +
- ", cancelReason='" + cancelReason + '\'' +
- ", cancelRemark='" + cancelRemark + '\'' +
- ", cancelPayMoney=" + cancelPayMoney +
- ", cancelUser='" + cancelUser + '\'' +
- ", reassign=" + reassign +
- ", remark='" + remark + '\'' +
- ", peopleNumber=" + peopleNumber +
- ", seatNumber='" + seatNumber + '\'' +
- ", cargoType=" + cargoType +
- ", urgent=" + urgent +
- '}';
- }
+ @ApiModelProperty("终点经度")
+ private String endLng;
+ @ApiModelProperty("司机头像")
+ private String driverAvatar;
+ @ApiModelProperty("司机名称")
+ private String driverName;
+ @ApiModelProperty("司机电话")
+ private String driverPhone;
+ @ApiModelProperty("司机编号")
+ private String driverCode;
+ @ApiModelProperty("司机驾龄")
+ private Integer driverAge;
+ @ApiModelProperty("代驾次数")
+ private Integer driverNumber;
+ @ApiModelProperty("司机评分")
+ private Double driverScore;
+ @ApiModelProperty("订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待支付，108=待评价，109=已完成，201=转单中，301=已取消，401=等待中）")
+ private Integer state;
- public static OrderInfoWarpper getOrderInfoWarpper(Map<String, Object> map){
- OrderInfoWarpper orderInfoWarpper = new OrderInfoWarpper();
- if(null != map){
- orderInfoWarpper.setOrderId(null != map.get("orderId") ? Integer.valueOf(String.valueOf(map.get("orderId"))) : 0);
- orderInfoWarpper.setOrderState(null != map.get("orderState") ? Integer.valueOf(String.valueOf(map.get("orderState"))) : 0);
- orderInfoWarpper.setOrderName(null != map.get("orderName") ? String.valueOf(map.get("orderName")) : "");
- orderInfoWarpper.setTravelTime(null != map.get("travelTime") ? String.valueOf(map.get("travelTime")) : "");
- orderInfoWarpper.setTravelTime_(null != map.get("travelTime_") ? String.valueOf(map.get("travelTime_")) : "");
- orderInfoWarpper.setArriveTime(null != map.get("arriveTime") ? String.valueOf(map.get("arriveTime")) : "");
- orderInfoWarpper.setStartAddress(null != map.get("startAddress") ? String.valueOf(map.get("startAddress")) : "");
- orderInfoWarpper.setEndAddress(null != map.get("endAddress") ? String.valueOf(map.get("endAddress")) : "");
- orderInfoWarpper.setTipMoney(null != map.get("tipMoney") ? Double.valueOf(String.valueOf(map.get("tipMoney"))) : 0);
- orderInfoWarpper.setStartDistance(null != map.get("startDistance") ? Double.valueOf(String.valueOf(map.get("startDistance"))) : 0);
- orderInfoWarpper.setTotalDistance(null != map.get("totalDistance") ? Double.valueOf(String.valueOf(map.get("totalDistance"))) : 0);
- orderInfoWarpper.setStartLon(null != map.get("startLon") ? String.valueOf(map.get("startLon")) : "");
- orderInfoWarpper.setStartLat(null != map.get("startLat") ? String.valueOf(map.get("startLat")) : "");
- orderInfoWarpper.setEndLon(null != map.get("endLon") ? String.valueOf(map.get("endLon")) : "");
- orderInfoWarpper.setEndLat(null != map.get("endLat") ? String.valueOf(map.get("endLat")) : "");
- orderInfoWarpper.setNickName(null != map.get("nickName") ? String.valueOf(map.get("nickName")) : "");
- orderInfoWarpper.setPhone(null != map.get("telX") ? String.valueOf(map.get("telX")) : (null != map.get("phone") ? String.valueOf(map.get("phone")) : ""));
- orderInfoWarpper.setHistoryNum(null != map.get("historyNum") ? Integer.valueOf(String.valueOf(map.get("historyNum"))) : 0);
- orderInfoWarpper.setOrderMoney(null != map.get("orderMoney") ? Double.valueOf(String.valueOf(map.get("orderMoney"))) : 0);
- orderInfoWarpper.setPayManner(null != map.get("payManner") ? Integer.valueOf(String.valueOf(map.get("payManner"))) : 0);
- orderInfoWarpper.setPayMoney(null != map.get("payMoney") ? Double.valueOf(String.valueOf(map.get("payMoney"))) : 0);
- orderInfoWarpper.setIsReassign(null != map.get("isReassign") ? Integer.valueOf(String.valueOf(map.get("isReassign"))) : 1);
- orderInfoWarpper.setTrackId(null != map.get("trackId") ? String.valueOf(map.get("trackId")) : "");
- orderInfoWarpper.setReservation(null != map.get("reservation") ? Integer.valueOf(String.valueOf(map.get("reservation"))) : 0);
- orderInfoWarpper.setType(null != map.get("type") ? String.valueOf(map.get("type")) : "");
- orderInfoWarpper.setEmergencyCall(null != map.get("emergencyCall") ? String.valueOf(map.get("emergencyCall")) : "");
- orderInfoWarpper.setCancelReason(null != map.get("cancelReason") ? String.valueOf(map.get("cancelReason")) : "");
- orderInfoWarpper.setCancelRemark(null != map.get("cancelRemark") ? String.valueOf(map.get("cancelRemark")) : "");
- orderInfoWarpper.setCancelPayMoney(null != map.get("cancelPayMoney") ? Double.valueOf(String.valueOf(map.get("cancelPayMoney"))) : 0);
- orderInfoWarpper.setCancelUser(null != map.get("cancelUser") ? String.valueOf(map.get("cancelUser")) : "");
- orderInfoWarpper.setReassign(null != map.get("reassign") ? Integer.valueOf(String.valueOf(map.get("reassign"))) : 1);
- orderInfoWarpper.setPeopleNumber(null != map.get("peopleNumber") ? Integer.valueOf(String.valueOf(map.get("peopleNumber"))) : 1);
- orderInfoWarpper.setRemark(null != map.get("remark") ? String.valueOf(map.get("remark")) : "");
- orderInfoWarpper.setSeatNumber(null != map.get("seatNumber") ? String.valueOf(map.get("seatNumber")) : "");
- orderInfoWarpper.setCargoType(null != map.get("cargoType") ? Integer.valueOf(map.get("cargoType").toString()) : 0);
- orderInfoWarpper.setUrgent(null != map.get("urgent") ? Integer.valueOf(map.get("urgent").toString()) : 0);
- orderInfoWarpper.setUserName(null != map.get("userName") ? String.valueOf(map.get("userName")) : "");
- orderInfoWarpper.setDifferenceMoney(null != map.get("differenceMoney") ? Double.valueOf(map.get("differenceMoney").toString()) : 0D);
- orderInfoWarpper.setOrderSource(null != map.get("orderSource") ? Integer.valueOf(map.get("orderSource").toString()) : 0);
- }
- return orderInfoWarpper;
- }
}
--
Gitblit v1.7.1