From 78851285202a040f8ddf998c067cd462874c1cb9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 19 十月 2023 14:55:27 +0800
Subject: [PATCH] 配置修改
---
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java | 69 ----------------------------------
1 files changed, 1 insertions(+), 68 deletions(-)
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
index 766e427..f29c02c 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
@@ -12,7 +12,7 @@
public class OrderListWarpper implements Comparable {
@ApiModelProperty("订单id")
private Integer id;
- @ApiModelProperty("订单类型（1=专车/快车，2=出租车，3=机场专线，7=景区直通车，8=公务出行）")
+ @ApiModelProperty("订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）")
private Integer type;
@ApiModelProperty("订单名称")
private String name;
@@ -39,52 +39,7 @@
private String remark;
@ApiModelProperty("支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））")
private Integer payManner;
- @ApiModelProperty("小件物流用户上传图片")
- private String userImg;
- @ApiModelProperty("小件物流司机上传图片")
- private String driverImg;
private Long travelTime;
- @ApiModelProperty("需要送达时间")
- private String arriveTimeExpect;
- @ApiModelProperty("超时状态（1=超时，2=未超时）")
- private Integer TimeOutState;
- @ApiModelProperty("乘车类型(1=独享，2=一口价，3=拼车)")
- private Integer rideType;
-
- @ApiModelProperty("是否拼单成功(0未成功，1成功)")
- private Integer spellSuccess;
-
- public Integer getSpellSuccess() {
- return spellSuccess;
- }
-
- public void setSpellSuccess(Integer spellSuccess) {
- this.spellSuccess = spellSuccess;
- }
-
- public Integer getRideType() {
- return rideType;
- }
-
- public void setRideType(Integer rideType) {
- this.rideType = rideType;
- }
-
- public Integer getTimeOutState() {
- return TimeOutState;
- }
-
- public void setTimeOutState(Integer timeOutState) {
- TimeOutState = timeOutState;
- }
-
- public String getArriveTimeExpect() {
- return arriveTimeExpect;
- }
-
- public void setArriveTimeExpect(String arriveTimeExpect) {
- this.arriveTimeExpect = arriveTimeExpect;
- }
public Integer getId() {
return id;
@@ -206,22 +161,6 @@
this.cargoNumber = cargoNumber;
}
- public String getUserImg() {
- return userImg;
- }
-
- public void setUserImg(String userImg) {
- this.userImg = userImg;
- }
-
- public String getDriverImg() {
- return driverImg;
- }
-
- public void setDriverImg(String driverImg) {
- this.driverImg = driverImg;
- }
-
@Override
public String toString() {
return "OrderListWarpper{" +
@@ -247,8 +186,6 @@
for(Map<String, Object> map : maps){
OrderListWarpper orderListWarpper = new OrderListWarpper();
orderListWarpper.setId(null != map.get("id") ? Integer.valueOf(String.valueOf(map.get("id"))) : 0);
- orderListWarpper.setRideType(null != map.get("rideType") ? Integer.valueOf(String.valueOf(map.get("rideType"))) : 1);
- orderListWarpper.setSpellSuccess(null != map.get("spellSuccess") ? Integer.valueOf(String.valueOf(map.get("spellSuccess"))) : 0);
orderListWarpper.setName(null != map.get("name") ? String.valueOf(map.get("name")) : "");
orderListWarpper.setTime(null != map.get("time") ? String.valueOf(map.get("time")) : "");
orderListWarpper.setStartAddress(null != map.get("startAddress") ? String.valueOf(map.get("startAddress")) : "");
@@ -263,10 +200,6 @@
orderListWarpper.setRemark(null != map.get("remark") ? String.valueOf(map.get("remark")) : "");
orderListWarpper.setPayManner(null != map.get("payManner") ? Integer.valueOf(String.valueOf(map.get("payManner"))) : 0);
orderListWarpper.setTravelTime(null != map.get("travelTime") ? Long.valueOf(String.valueOf(map.get("travelTime"))) : 0);
- orderListWarpper.setUserImg(null != map.get("userImg") ? String.valueOf(map.get("userImg")) : "");
- orderListWarpper.setDriverImg(null != map.get("driverImg") ? String.valueOf(map.get("driverImg")) : "");
- orderListWarpper.setArriveTimeExpect(null != map.get("arriveTimeExpect") ? String.valueOf(map.get("arriveTimeExpect")) : "");
- orderListWarpper.setTimeOutState(null != map.get("timeOutState") ? Integer.parseInt(map.get("timeOutState").toString()) : 2);
list.add(orderListWarpper);
}
}
--
Gitblit v1.7.1