From 33ac3b8bf6683024784d9e3152732bc0d50472c3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 四月 2025 22:50:47 +0800
Subject: [PATCH] 修改文档bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 624 ++------------------------------------------------------
1 files changed, 26 insertions(+), 598 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index 62961dc..3d8b3bc 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -3,10 +3,12 @@
import com.stylefeng.guns.modular.system.model.OrderPosition;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.util.List;
import java.util.Map;
+@Data
@ApiModel("订单详情")
public class OrderInfoWarpper {
@ApiModelProperty("订单id")
@@ -15,7 +17,7 @@
private Integer orderType;
@ApiModelProperty("订单类型（1=普通订单，2=摆渡车）")
private Integer type;
- @ApiModelProperty("订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）")
+ @ApiModelProperty("订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价）")
private Integer state;
@ApiModelProperty("下单时间")
private String insertTime;
@@ -67,9 +69,9 @@
private Integer cancelId;
@ApiModelProperty("订单总金额")
private Double orderMoney;
- @ApiModelProperty("起步里程")
- private Double startMoney;
@ApiModelProperty("起步价")
+ private Double startMoney;
+ @ApiModelProperty("起步里程")
private Double startMileage;
@ApiModelProperty("里程数")
private Double mileage;
@@ -101,6 +103,8 @@
private Double discount;
@ApiModelProperty("折扣优惠金额")
private Double discountMoney;
+ @ApiModelProperty("补差价金额")
+ private Double priceDifference;
@ApiModelProperty("订单支付金额")
private Double payMoney;
@ApiModelProperty("订单支付方式（1=手机支付，2=银行卡支付，3=余额支付，4=现金支付）")
@@ -129,608 +133,25 @@
private String remark;
@ApiModelProperty("是否首单免费1否，2是")
private String isFree;
-
- /**
- * 收费方式(1=普通，2=夜间，3=高峰)
- */
@ApiModelProperty("收费方式(1=普通，2=夜间，3=高峰)")
private Integer moneyType;
- /**
- * 收费方式时间段
- */
@ApiModelProperty("收费方式时间段")
private String moneyTime;
-
private Integer startDuration;
- /**
- * 收据链接
- */
@ApiModelProperty("收据链接")
private String receipt;
-
-
- public Integer getStartDuration() {
- return startDuration;
- }
-
- public void setStartDuration(Integer startDuration) {
- this.startDuration = startDuration;
- }
-
- public Integer getMoneyType() {
- return moneyType;
- }
-
- public void setMoneyType(Integer moneyType) {
- this.moneyType = moneyType;
- }
-
- public String getMoneyTime() {
- return moneyTime;
- }
-
- public void setMoneyTime(String moneyTime) {
- this.moneyTime = moneyTime;
- }
-
+ @ApiModelProperty("是否冻结（1=否，2=是）")
+ private Integer isFrozen;
+ @ApiModelProperty("司机接单时间")
+ private String snatchOrderTime;
+ @ApiModelProperty("司机超时时间")
+ private Integer driverTimeOutTime;
+ @ApiModelProperty("司机是否超时（0=否，1=是）")
+ private Integer driverTimeOut;
+ private String tripId;
private List<OrderPosition> orderPositionList;
-
- public List<OrderPosition> getOrderPositionList() {
- return orderPositionList;
- }
-
- public void setOrderPositionList(List<OrderPosition> orderPositionList) {
- this.orderPositionList = orderPositionList;
- }
-
- public String getIsFree() {
- return isFree;
- }
-
- public void setIsFree(String isFree) {
- this.isFree = isFree;
- }
-
- public Integer getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Integer orderId) {
- this.orderId = orderId;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- 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 Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public String getDriverAvatar() {
- return driverAvatar;
- }
-
- public void setDriverAvatar(String driverAvatar) {
- this.driverAvatar = driverAvatar;
- }
-
- public String getDriverName() {
- return driverName;
- }
-
- public void setDriverName(String driverName) {
- this.driverName = driverName;
- }
-
- public String getLicensePlate() {
- return licensePlate;
- }
-
- public void setLicensePlate(String licensePlate) {
- this.licensePlate = licensePlate;
- }
-
- public String getBrand() {
- return brand;
- }
-
- public void setBrand(String brand) {
- this.brand = brand;
- }
-
- public Double getScore() {
- return score;
- }
-
- public void setScore(Double score) {
- this.score = score;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- public String getDriverPhone() {
- return driverPhone;
- }
-
- public void setDriverPhone(String driverPhone) {
- this.driverPhone = driverPhone;
- }
-
- public Double getCancelPayMoney() {
- return cancelPayMoney;
- }
-
- public void setCancelPayMoney(Double cancelPayMoney) {
- this.cancelPayMoney = cancelPayMoney;
- }
-
- public Double getPayMoney() {
- return payMoney;
- }
-
- public void setPayMoney(Double payMoney) {
- this.payMoney = payMoney;
- }
-
- public Double getTipMoney() {
- return tipMoney;
- }
-
- public void setTipMoney(Double tipMoney) {
- this.tipMoney = tipMoney;
- }
-
- public Double getOrderMoney() {
- return orderMoney;
- }
-
- public void setOrderMoney(Double orderMoney) {
- this.orderMoney = orderMoney;
- }
-
- public Double getStartMoney() {
- return startMoney;
- }
-
- public void setStartMoney(Double startMoney) {
- this.startMoney = startMoney;
- }
-
- public Double getMileageMoney() {
- return mileageMoney;
- }
-
- public void setMileageMoney(Double mileageMoney) {
- this.mileageMoney = mileageMoney;
- }
-
- public Double getDurationMoney() {
- return durationMoney;
- }
-
- public void setDurationMoney(Double durationMoney) {
- this.durationMoney = durationMoney;
- }
-
- public Double getLongDistanceMoney() {
- return longDistanceMoney;
- }
-
- public void setLongDistanceMoney(Double longDistanceMoney) {
- this.longDistanceMoney = longDistanceMoney;
- }
-
- public String getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(String insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getArriveTime() {
- return arriveTime;
- }
-
- public void setArriveTime(String arriveTime) {
- this.arriveTime = arriveTime;
- }
-
- public Double getStartLon() {
- return startLon;
- }
-
- public void setStartLon(Double startLon) {
- this.startLon = startLon;
- }
-
- public Double getStartLat() {
- return startLat;
- }
-
- public void setStartLat(Double startLat) {
- this.startLat = startLat;
- }
-
- public Double getEndLon() {
- return endLon;
- }
-
- public void setEndLon(Double endLon) {
- this.endLon = endLon;
- }
-
- public Double getEndLat() {
- return endLat;
- }
-
- public void setEndLat(Double endLat) {
- this.endLat = endLat;
- }
-
- public Integer getOrderScore() {
- return orderScore;
- }
-
- public void setOrderScore(Integer orderScore) {
- this.orderScore = orderScore;
- }
-
- public String getEvaluate() {
- return evaluate;
- }
-
- public void setEvaluate(String evaluate) {
- this.evaluate = evaluate;
- }
-
- public String getCarColor() {
- return carColor;
- }
-
- public void setCarColor(String carColor) {
- this.carColor = carColor;
- }
-
- public Integer getCancelId() {
- return cancelId;
- }
-
- public void setCancelId(Integer cancelId) {
- this.cancelId = cancelId;
- }
-
- public Double getTravelMoney() {
- return travelMoney;
- }
-
- public void setTravelMoney(Double travelMoney) {
- this.travelMoney = travelMoney;
- }
-
- public Double getParkMoney() {
- return parkMoney;
- }
-
- public void setParkMoney(Double parkMoney) {
- this.parkMoney = parkMoney;
- }
-
- public Double getRoadTollMoney() {
- return roadTollMoney;
- }
-
- public void setRoadTollMoney(Double roadTollMoney) {
- this.roadTollMoney = roadTollMoney;
- }
-
- public Double getRedPacketMoney() {
- return redPacketMoney;
- }
-
- public void setRedPacketMoney(Double redPacketMoney) {
- this.redPacketMoney = redPacketMoney;
- }
-
- public Double getCouponMoney() {
- return couponMoney;
- }
-
- public void setCouponMoney(Double couponMoney) {
- this.couponMoney = couponMoney;
- }
-
- public Double getDiscountMoney() {
- return discountMoney;
- }
-
- public void setDiscountMoney(Double discountMoney) {
- this.discountMoney = discountMoney;
- }
-
- public Integer getDevice() {
- return device;
- }
-
- public void setDevice(Integer device) {
- this.device = device;
- }
-
- 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 Double getMileage() {
- return mileage;
- }
-
- public void setMileage(Double mileage) {
- this.mileage = mileage;
- }
-
- public Double getDuration() {
- return duration;
- }
-
- public void setDuration(Double duration) {
- this.duration = duration;
- }
-
- public Double getWait() {
- return wait;
- }
-
- public void setWait(Double wait) {
- this.wait = wait;
- }
-
- public Double getWaitMoney() {
- return waitMoney;
- }
-
- public void setWaitMoney(Double waitMoney) {
- this.waitMoney = waitMoney;
- }
-
- public Double getLongDistance() {
- return longDistance;
- }
-
- public void setLongDistance(Double longDistance) {
- this.longDistance = longDistance;
- }
-
- public Double getStartMileage() {
- return startMileage;
- }
-
- public void setStartMileage(Double startMileage) {
- this.startMileage = startMileage;
- }
-
- public String getTravelTime1() {
- return travelTime1;
- }
-
- public void setTravelTime1(String travelTime1) {
- this.travelTime1 = travelTime1;
- }
-
- public Double getDiscount() {
- return discount;
- }
-
- public void setDiscount(Double discount) {
- this.discount = discount;
- }
-
- public Integer getCancelUserType() {
- return cancelUserType;
- }
-
- public void setCancelUserType(Integer cancelUserType) {
- this.cancelUserType = cancelUserType;
- }
-
- public Double getCancelMoney() {
- return cancelMoney;
- }
-
- public void setCancelMoney(Double cancelMoney) {
- this.cancelMoney = cancelMoney;
- }
-
- 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 String getStartCity() {
- return startCity;
- }
-
- public void setStartCity(String startCity) {
- this.startCity = startCity;
- }
-
- public String getEndCity() {
- return endCity;
- }
-
- public void setEndCity(String endCity) {
- this.endCity = endCity;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getLineShiftTime() {
- return lineShiftTime;
- }
-
- public void setLineShiftTime(String lineShiftTime) {
- this.lineShiftTime = lineShiftTime;
- }
-
- public Integer getPayType() {
- return payType;
- }
-
- public void setPayType(Integer payType) {
- this.payType = payType;
- }
-
- public String getReceipt() {
- return receipt;
- }
-
- public void setReceipt(String receipt) {
- this.receipt = receipt;
- }
-
- @Override
- public String toString() {
- return "OrderInfoWarpper{" +
- "orderId=" + orderId +
- ", type=" + type +
- ", state=" + state +
- ", insertTime='" + insertTime + '\'' +
- ", travelTime='" + travelTime + '\'' +
- ", travelTime1='" + travelTime1 + '\'' +
- ", arriveTime='" + arriveTime + '\'' +
- ", startLon=" + startLon +
- ", startLat=" + startLat +
- ", startAddress='" + startAddress + '\'' +
- ", startCity='" + startCity + '\'' +
- ", endLon=" + endLon +
- ", endLat=" + endLat +
- ", endAddress='" + endAddress + '\'' +
- ", endCity='" + endCity + '\'' +
- ", driverId=" + driverId +
- ", driverAvatar='" + driverAvatar + '\'' +
- ", driverName='" + driverName + '\'' +
- ", licensePlate='" + licensePlate + '\'' +
- ", brand='" + brand + '\'' +
- ", carColor='" + carColor + '\'' +
- ", score=" + score +
- ", orderNum=" + orderNum +
- ", driverPhone='" + driverPhone + '\'' +
- ", cancelPayMoney=" + cancelPayMoney +
- ", cancelId=" + cancelId +
- ", orderMoney=" + orderMoney +
- ", startMoney=" + startMoney +
- ", startMileage=" + startMileage +
- ", mileage=" + mileage +
- ", mileageMoney=" + mileageMoney +
- ", duration=" + duration +
- ", durationMoney=" + durationMoney +
- ", wait=" + wait +
- ", waitMoney=" + waitMoney +
- ", longDistance=" + longDistance +
- ", longDistanceMoney=" + longDistanceMoney +
- ", travelMoney=" + travelMoney +
- ", parkMoney=" + parkMoney +
- ", roadTollMoney=" + roadTollMoney +
- ", redPacketMoney=" + redPacketMoney +
- ", couponMoney=" + couponMoney +
- ", discount=" + discount +
- ", discountMoney=" + discountMoney +
- ", payMoney=" + payMoney +
- ", tipMoney=" + tipMoney +
- ", orderScore=" + orderScore +
- ", evaluate='" + evaluate + '\'' +
- ", device=" + device +
- ", peopleNumber=" + peopleNumber +
- ", seatNumber='" + seatNumber + '\'' +
- ", cancelUserType=" + cancelUserType +
- ", cancelMoney=" + cancelMoney +
- ", cancelReason='" + cancelReason + '\'' +
- ", cancelRemark='" + cancelRemark + '\'' +
- '}';
- }
+ @ApiModelProperty("争议订单（0=否，1=是）")
+ private Integer isDispute;
public static OrderInfoWarpper getOrderInfoWarpper(Map<String, Object> map){
OrderInfoWarpper orderInfoWarpper = new OrderInfoWarpper();
@@ -746,7 +167,7 @@
orderInfoWarpper.setEndAddress(null != map.get("endAddress") ? String.valueOf(map.get("endAddress")) : "");
orderInfoWarpper.setDriverId(null != map.get("driverId") ? Integer.valueOf(String.valueOf(map.get("driverId"))) : 0);
orderInfoWarpper.setDriverAvatar(null != map.get("driverAvatar") ? String.valueOf(map.get("driverAvatar")) : "");
- orderInfoWarpper.setDriverName(null != map.get("driverName") ? String.valueOf(map.get("driverName")).substring(0, 1) + "师傅" : "");
+ orderInfoWarpper.setDriverName(null != map.get("driverName") ? String.valueOf(map.get("driverName")) : "");
orderInfoWarpper.setLicensePlate(null != map.get("licensePlate") ? String.valueOf(map.get("licensePlate")) : "");
orderInfoWarpper.setBrand(null != map.get("brand") ? String.valueOf(map.get("brand")) : "");
orderInfoWarpper.setScore(null != map.get("score") ? Double.valueOf(String.valueOf(map.get("score"))) : 0);
@@ -799,6 +220,13 @@
orderInfoWarpper.setMoneyTime(null != map.get("moneyTime") ? map.get("moneyTime").toString() :"");
orderInfoWarpper.setPayType(null != map.get("payType") ? Integer.valueOf(map.get("payType").toString()) : 4);
orderInfoWarpper.setReceipt(null != map.get("receipt") ? map.get("receipt").toString() : "");
+ orderInfoWarpper.setIsFrozen(null != map.get("isFrozen") ? Integer.valueOf(map.get("isFrozen").toString()) : 1);
+ orderInfoWarpper.setDriverTimeOutTime(null != map.get("driverTimeOutTime") ? Integer.valueOf(map.get("driverTimeOutTime").toString()) : 0);
+ orderInfoWarpper.setDriverTimeOut(null != map.get("driverTimeOut") ? Integer.valueOf(map.get("driverTimeOut").toString()) : 0);
+ orderInfoWarpper.setSnatchOrderTime(null != map.get("snatchOrderTime") ? map.get("snatchOrderTime").toString() : "");
+ orderInfoWarpper.setPriceDifference(null != map.get("priceDifference") ? Double.valueOf(map.get("priceDifference").toString()) : 0);
+ orderInfoWarpper.setTripId(null != map.get("tripId") ? map.get("tripId").toString() : "");
+ orderInfoWarpper.setIsDispute(null != map.get("isDispute") ? Integer.valueOf(map.get("isDispute").toString()) : 0);
}
if(orderInfoWarpper.getState()==7){
orderInfoWarpper.setOrderMoney(orderInfoWarpper.getOrderMoney()-orderInfoWarpper.getDiscountMoney());
--
Gitblit v1.7.1