From e4874ff3af0c59b6b9a1ee1ae39a332829253cd7 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期四, 06 四月 2023 16:00:18 +0800
Subject: [PATCH] 名称调整
---
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java | 2
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java | 2
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 4 +-
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java | 2
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java | 2
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TaxiCardController.java | 4 +-
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 4 +-
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/MerchantController.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOrders.java | 2
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java | 2
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCityBusiness.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderStatusWarpper.java | 2
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java | 4 +-
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java | 2
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderEvaluate.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 20 +++++-----
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java | 2
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java | 2
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java | 2
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 6 +-
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java | 2
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java | 2
32 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java
index bd040d9..fe36462 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java
@@ -22,7 +22,7 @@
@TableField("carId")
private Integer carId;
/**
- * 服务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 服务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("type")
private Integer type;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java
index 7c58371..2eabbc8 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java
@@ -22,7 +22,7 @@
@TableField("driverId")
private Integer driverId;
/**
- * 业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("type")
private Integer type;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java
index 49bd976..ccfeade 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java
@@ -34,7 +34,7 @@
@TableField("endTime")
private Date endTime;
/**
- * 业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("type")
private String type;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCityBusiness.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCityBusiness.java
index c6a92d0..3a60c06 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCityBusiness.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCityBusiness.java
@@ -9,7 +9,7 @@
@TableName("t_open_city_business")
public class OpenCityBusiness extends BaseBean {
/**
- * 业务类型（1=专车，2=出租车，3=跨城出行，4=同城小件物流，5=跨城小件物流，6=包车）
+ * 业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("businessType")
private Integer businessType;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
index e372cc1..c2a5ea7 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
@@ -24,7 +24,7 @@
@TableField("orderId")
private Integer orderId;
/**
- * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("orderType")
private Integer orderType;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java
index 9b07899..722816b 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java
@@ -19,7 +19,7 @@
@TableField("id")
private Integer id;
/**
- * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("orderType")
private Integer orderType;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java
index 0ad04e9..2d71742 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java
@@ -20,7 +20,7 @@
@TableField("id")
private Integer id;
/**
- * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("orderType")
private Integer orderType;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java
index 5a88fa9..185a1e8 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java
@@ -17,7 +17,7 @@
@TableField("id")
private Integer id;
/**
- * 业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("type")
private Integer type;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index 123e90f..63f082f 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -52,7 +52,7 @@
* @param type 1=用户，2=司机
* @param uid 对象id
* @param orderId 订单id
- * @param orderType 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * @param orderType 订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
* @param state 订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）
*/
public void pushOrderState(Integer type, Integer uid, Integer orderId, Integer orderType, Integer state, Integer time){
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 187e82b..988b86a 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -365,7 +365,7 @@
@PostMapping("/api/driver/work")
@ApiOperation(value = "司机上下班操作", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "上班的业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）多个已逗号分隔", name = "type", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "上班的业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）多个已逗号分隔", name = "type", required = false, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil work(String type, HttpServletRequest request){
@@ -386,7 +386,7 @@
@PostMapping("/api/driver/work2")
@ApiOperation(value = "司机上下班操作,同时设置接单类型", tags = {"司机端-车载端"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "上班的业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）多个已逗号分隔", name = "type", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "上班的业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）多个已逗号分隔", name = "type", required = false, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil work2(String type, HttpServletRequest request){
@@ -627,7 +627,7 @@
@PostMapping("/api/driver/updateOrders")
@ApiOperation(value = "设置接单规则", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil updateOrders(Integer type, HttpServletRequest request){
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java
index 9d74868..1714160 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java
@@ -48,7 +48,7 @@
@ApiOperation(value = "司机端主动调用该接口上传位置信息", tags = {"司机端-仿socket接口"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = false, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = false, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = false, dataType = "int"),
@ApiImplicitParam(value = "经度", name = "lon", required = true, dataType = "string"),
@ApiImplicitParam(value = "纬度", name = "lat", required = true, dataType = "string"),
@ApiImplicitParam(value = "方向角", name = "directionAngle", required = true, dataType = "string"),
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index bc4f6a4..58ada29 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -207,7 +207,7 @@
@ApiOperation(value = "获取抢单界面的订单详情", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，7=助老模式）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "当前定位经度", name = "lon", required = true, dataType = "string"),
@ApiImplicitParam(value = "当前定位纬度", name = "lat", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -235,7 +235,7 @@
@ApiOperation(value = "司机抢单操作", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil grabOrder(Integer orderId, Integer orderType, HttpServletRequest request){
@@ -266,7 +266,7 @@
@ApiOperation(value = "获取服务中页面订单详情", tags = {"司机端-服务中"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<OrderInfoWarpper> queryOrderInfo(Integer orderId, Integer orderType){
@@ -306,7 +306,7 @@
@ApiOperation(value = "获取服务中页面订单详情", tags = {"司机端-服务中"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<OrderWarpper> queryOrderInfo1(Integer orderId, Integer orderType){
@@ -369,7 +369,7 @@
@ApiOperation(value = "获取改派支付金额", tags = {"司机端-服务中"}, notes = "返回金额为0不需要调用支付")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id（跨城多个订单使用逗号分隔）", name = "orderId", required = true, dataType = "string"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<BaseWarpper> queryReassignMoney(String orderId, Integer orderType){
@@ -400,7 +400,7 @@
@ApiOperation(value = "提交改派申请", tags = {"司机端-服务中"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "改派支付方式（1=微信，2=支付宝，3=余额）", name = "payType", required = false, dataType = "int"),
@ApiImplicitParam(value = "改派原因", name = "reason", required = true, dataType = "string"),
@ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"),
@@ -437,7 +437,7 @@
@ApiOperation(value = "司机走流程操作", tags = {"司机端-服务中"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束）", name = "state", required = true, dataType = "int"),
@ApiImplicitParam(value = "当前经度", name = "lon", required = true, dataType = "double"),
@ApiImplicitParam(value = "当前纬度", name = "lat", required = true, dataType = "double"),
@@ -670,7 +670,7 @@
@ApiOperation(value = "提交改派申请", tags = {"司机端-服务中"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "改派支付方式（1=微信，2=支付宝，3=余额）", name = "payType", required = false, dataType = "int"),
@ApiImplicitParam(value = "改派原因", name = "reason", required = true, dataType = "string"),
@ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"),
@@ -749,7 +749,7 @@
@ApiOperation(value = "接单后获取语音播报内容", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "当前位置经度", name = "lon", required = true, dataType = "string"),
@ApiImplicitParam(value = "当前位置纬度", name = "lat", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -967,7 +967,7 @@
@PostMapping("/api/order/queryAdditionalFee")
@ApiOperation(value = "1.0-获取确认费用页面的附加费", tags = {"司机端-服务中"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城出行，4=同城小件，5=跨城小件，7=助老模式）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java
index bd040d9..fe36462 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java
@@ -22,7 +22,7 @@
@TableField("carId")
private Integer carId;
/**
- * 服务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 服务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("type")
private Integer type;
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOrders.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOrders.java
index be80997..4140b58 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOrders.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOrders.java
@@ -22,7 +22,7 @@
@TableField("driverId")
private Integer driverId;
/**
- * 允许接单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 允许接单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("type")
private Integer type;
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java
index 7c58371..2eabbc8 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java
@@ -22,7 +22,7 @@
@TableField("driverId")
private Integer driverId;
/**
- * 业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("type")
private Integer type;
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java
index 48452cc..a2c5595 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java
@@ -35,7 +35,7 @@
@TableField("endTime")
private Date endTime;
/**
- * 业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("type")
private String type;
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
index 84a7594..02fe5c8 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
@@ -24,7 +24,7 @@
@TableField("orderId")
private Integer orderId;
/**
- * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("orderType")
private Integer orderType;
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java
index 9b07899..722816b 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java
@@ -19,7 +19,7 @@
@TableField("id")
private Integer id;
/**
- * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("orderType")
private Integer orderType;
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java
index 64c5cda..b3cfb24 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java
@@ -20,7 +20,7 @@
@TableField("id")
private Integer id;
/**
- * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("orderType")
private Integer orderType;
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java
index 5a88fa9..185a1e8 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java
@@ -17,7 +17,7 @@
@TableField("id")
private Integer id;
/**
- * 业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("type")
private Integer type;
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
index fd99d5f..0d74c16 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
@@ -53,7 +53,7 @@
private String idCardImgUrl2;
@ApiModelProperty("初次领取驾驶证日期")
private String getDriverLicenseDate;
- @ApiModelProperty("服务模式（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）多个以逗号分隔")
+ @ApiModelProperty("服务模式（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）多个以逗号分隔")
private String type;
@ApiModelProperty("从业地(带分隔符)")
private String placeOfPractice;
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 edfb199..29b98ca 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=城际，4=小件物流-同城，5=小件物流-跨城，6=包车，7=助老模式）")
+ @ApiModelProperty("订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）")
private Integer type;
@ApiModelProperty("订单名称")
private String name;
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderStatusWarpper.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderStatusWarpper.java
index 31164b3..c1dba0b 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderStatusWarpper.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderStatusWarpper.java
@@ -7,7 +7,7 @@
public class OrderStatusWarpper {
@ApiModelProperty("订单id")
private Integer orderId;
- @ApiModelProperty("订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）")
+ @ApiModelProperty("订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）")
private Integer orderType;
@ApiModelProperty("订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中）")
private Integer state;
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
index 049b69f..f58acec 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
@@ -27,7 +27,7 @@
private String idCardImgUrl2;
@ApiModelProperty("初次领取驾驶证日期")
private Date getDriverLicenseDate;
- @ApiModelProperty("服务模式（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）多个以逗号分隔")
+ @ApiModelProperty("服务模式（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）多个以逗号分隔")
private String type;
@ApiModelProperty("从业地行政代码（510100）")
private String placeOfEmployment;
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index f409dcd..09008b2 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -42,14 +42,14 @@
/**
* 获取5公里范围内空闲司机数量
- * @param type 业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * @param type 业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
* @return
*/
@ResponseBody
@PostMapping("/base/driver/queryIdleDriver")
@ApiOperation(value = "获取5公里范围内空闲司机数量", tags = {"用户端-首页"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "乘客当前定位经度", name = "lon", required = true, dataType = "double"),
@ApiImplicitParam(value = "乘客当前定位纬度", name = "lat", required = true, dataType = "double")
})
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/MerchantController.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/MerchantController.java
index 6a563d8..65a3171 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/MerchantController.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/MerchantController.java
@@ -203,7 +203,7 @@
@ApiOperation(value = "1.0-订单完成后获取商家优惠券", tags = {"用户端-出租车", "用户端-专车", "用户端-跨城","用户端-小件物流"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城，4=同城小件物流，5=跨城小件物流）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<List<MerchantCouponListWarpper>> giveAwayMerchantCoupon(Integer orderId, Integer orderType, HttpServletRequest request){
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java
index 405a6b1..0147fd4 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java
@@ -44,7 +44,7 @@
@ApiOperation(value = "获取没有司机接单的提醒数据", tags = {"用户端-仿socket接口"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，4=小件物流-同城，5=小件物流-跨城，6=包车）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<EndPushWarpper> queryEndPush(Integer orderId, Integer orderType, HttpServletRequest request){
@@ -73,7 +73,7 @@
@ApiOperation(value = "获取服务中的及时数据", tags = {"用户端-仿socket接口"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<OrderServerWarpper> queryOrderServer(Integer orderId, Integer orderType, HttpServletRequest request){
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 14aa5d3..ec64b1f 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -196,7 +196,7 @@
@PostMapping("/api/order/queryMyOrderList")
@ApiOperation(value = "获取个人中心订单列表", tags = {"用户端-个人中心"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城出行，4=同城小件物流， 5=跨城小件物流，6=包车，7=助老模式）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "页码（首页1）", name = "pageNum", required = true, dataType = "int"),
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -301,7 +301,7 @@
@ApiOperation(value = "发票页获取订单列表", tags = {"用户端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单开票状态（1=未开票，2=其他）", name = "type", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城出行，4=同城小件物流，5=跨城小件物流）", name = "orderType", required = false, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = false, dataType = "int"),
@ApiImplicitParam(value = "开始日期", name = "startTime", required = false, dataType = "string"),
@ApiImplicitParam(value = "结束日期", name = "endTime", required = false, dataType = "string"),
@ApiImplicitParam(value = "开始金额", name = "startMoney", required = false, dataType = "double"),
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java
index 855449e..750209b 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java
@@ -40,7 +40,7 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "起点经纬度（103.22121,,30.26123）", name = "startLonLat", required = true, dataType = "string"),
@ApiImplicitParam(value = "终点经纬度（103.22121,,30.26123）", name = "endLonLat", required = true, dataType = "string"),
- @ApiImplicitParam(value = "业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）", name = "type", required = true, dataType = "int")
+ @ApiImplicitParam(value = "业务类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "type", required = true, dataType = "int")
})
public ResultUtil<List<ServerCarModelWarpper>> queryServerCarModel(String startLonLat, String endLonLat, Integer type){
try {
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TaxiCardController.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TaxiCardController.java
index 177b81d..2ba3434 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TaxiCardController.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TaxiCardController.java
@@ -39,7 +39,7 @@
@PostMapping("/getTaxiCardList")
@ApiOperation(value = "1.0-获取购买打车卡列表", tags = {"用户端-出租车", "用户端-专车", "用户端-跨城","用户端-小件物流"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城，4=同城小件物流，5=跨城小件物流）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "当前定位经度", name = "lon", required = true, dataType = "string"),
@ApiImplicitParam(value = "当前定位纬度", name = "lat", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -105,7 +105,7 @@
@PostMapping("/getMyTaxiCardList")
@ApiOperation(value = "1.0-获取我的出行卡列表", tags = {"用户端-个人中心"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城，4=同城小件物流，5=跨城小件物流）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<List<TaxiCardWapper>> getMyTaxiCardList(Integer orderType, HttpServletRequest request){
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
index 84a7594..02fe5c8 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
@@ -24,7 +24,7 @@
@TableField("orderId")
private Integer orderId;
/**
- * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * 订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("orderType")
private Integer orderType;
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderEvaluate.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderEvaluate.java
index 5b25f94..2fa46e3 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderEvaluate.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderEvaluate.java
@@ -29,7 +29,7 @@
@TableField("driverId")
private Integer driverId;
/**
- * 订单类型（1=专车，2=出租车，3=跨城出行，4=同城小件物流，5=跨城小件物流，6=包车）
+ * 订单类型（1=专车/快车，2=出租车，3=机场专线，4=景区直通车，5=公务出行）
*/
@TableField("orderType")
private Integer orderType;
--
Gitblit v1.7.1