From 1e0b6b811c554a4d06d4869c75243c153f40ea9e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 一月 2025 17:40:41 +0800
Subject: [PATCH] 线下支付
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 0050f29..b3e2631 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -426,16 +426,15 @@
@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"),
- @ApiImplicitParam(value = "支付方式 1=线上 2=线下支付", name = "payManner", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil process(Integer orderId, Integer orderType, Integer state, Double lon, Double lat,Integer payManner, HttpServletRequest request){
+ public ResultUtil process(Integer orderId, Integer orderType, Integer state, Double lon, Double lat,HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return orderService.process(orderId, orderType, state, uid, lon, lat,payManner);
+ return orderService.process(orderId, orderType, state, uid, lon, lat);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -515,7 +514,7 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际）", name = "orderType", required = true, dataType = "int"),
- @ApiImplicitParam(value = "支付方式（1=OK平台收款，2=其他方式收款）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "支付方式（1=OK平台收款，2=其他方式收款，3=线下收款）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "行程费用（出租车必传）", name = "travelFee", required = false, dataType = "double"),
@ApiImplicitParam(value = "停车费", name = "parkingFee", required = false, dataType = "double"),
@ApiImplicitParam(value = "过路费", name = "crossingFee", required = false, dataType = "double"),
--
Gitblit v1.7.1