From 74aaaab01e109d3f408cf586ea2c4661872190f1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 05 八月 2025 18:40:42 +0800
Subject: [PATCH] 先用后付
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/controller/OrderPrivateCarController.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/controller/OrderPrivateCarController.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/controller/OrderPrivateCarController.java
index bf0c625..1bdcbd1 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/controller/OrderPrivateCarController.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/controller/OrderPrivateCarController.java
@@ -11,6 +11,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -57,9 +58,69 @@
* @param request
* @return
*/
+// @ResponseBody
+// @PostMapping("/api/orderPrivateCar/saveOrderPrivateCar")
+// @ApiOperation(value = "专车下单/扫码下单", tags = {"用户端-专车"}, notes = "")
+// @ApiImplicitParams({
+// @ApiImplicitParam(value = "订单类型（1=普通订单，2=摆渡订单）", name = "type", required = true, dataType = "int"),
+// @ApiImplicitParam(value = "服务车型id（扫码下单不用上传）", name = "serverCarModelId", required = false, dataType = "int"),
+// @ApiImplicitParam(value = "出行时间（2020-08-20 10:10）", name = "travelTime", required = true, dataType = "string"),
+// @ApiImplicitParam(value = "是否预约（1=否，2=是）", name = "orderType", required = true, dataType = "int"),
+// @ApiImplicitParam(value = "是否代下单（0=否，1=是）", name = "substitute", required = true, dataType = "int"),
+// @ApiImplicitParam(value = "下单地点经度", name = "placementLon", required = true, dataType = "string"),
+// @ApiImplicitParam(value = "下单地点纬度", name = "placementLat", required = true, dataType = "string"),
+// @ApiImplicitParam(value = "起点经度", name = "startLon", required = true, dataType = "string"),
+// @ApiImplicitParam(value = "起点纬度", name = "startLat", required = true, dataType = "string"),
+// @ApiImplicitParam(value = "起点地址", name = "startAddress", required = true, dataType = "string"),
+// @ApiImplicitParam(value = "终点经度", name = "endLon", required = true, dataType = "string"),
+// @ApiImplicitParam(value = "终点纬度", name = "endLat", required = true, dataType = "string"),
+// @ApiImplicitParam(value = "终点地址", name = "endAddress", required = true, dataType = "string"),
+// @ApiImplicitParam(value = "订单来源（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）", name = "orderSource", required = true, dataType = "int"),
+// @ApiImplicitParam(value = "司机id（扫码下单必传）", name = "driverId", required = false, dataType = "int"),
+// @ApiImplicitParam(value = "乘客姓名（代下单必传）", name = "passengers", required = false, dataType = "string"),
+// @ApiImplicitParam(value = "乘客电话（代下单必传）", name = "passengersPhone", required = false, dataType = "string"),
+// @ApiImplicitParam(value = "预估价", name = "estimatedPrice", required = false, dataType = "BigDecimal"),
+// @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+// })
+// public ResultUtil<BaseWarpper> saveOrderPrivateCar(Integer serverCarModelId, Date travelTime, Integer orderType, Integer substitute, String placementLon, String placementLat, String startLon, String startLat,
+// String startAddress, String endLon, String endLat, String endAddress, String passengers, String passengersPhone, Integer orderSource, Integer driverId,
+// Integer type, BigDecimal estimatedPrice, HttpServletRequest request){
+// try {
+// Integer uid = userInfoService.getUserIdFormRedis(request);
+// if(null == uid){
+// return ResultUtil.tokenErr();
+// }
+// return orderPrivateCarService.saveOrderPrivateCar(serverCarModelId, travelTime, orderType, substitute, placementLon, placementLat,
+// startLon, startLat, startAddress, endLon, endLat, endAddress, passengers, passengersPhone, orderSource, driverId, type, uid,estimatedPrice);
+// }catch (Exception e){
+// e.printStackTrace();
+// return ResultUtil.runErr();
+// }
+// }
+ /**
+ * 专车下单
+ * @param serverCarModelId
+ * @param travelTime
+ * @param orderType
+ * @param substitute
+ * @param placementLon
+ * @param placementLat
+ * @param startLon
+ * @param startLat
+ * @param startAddress
+ * @param endLon
+ * @param endLat
+ * @param endAddress
+ * @param passengers
+ * @param passengersPhone
+ * @param orderSource
+ * @param driverId
+ * @param request
+ * @return
+ */
@ResponseBody
@PostMapping("/api/orderPrivateCar/saveOrderPrivateCar")
- @ApiOperation(value = "专车下单/扫码下单", tags = {"用户端-专车"}, notes = "")
+ @ApiOperation(value = "专车下单/扫码下单[0731]", tags = {"用户端-专车"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单类型（1=普通订单，2=摆渡订单）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "服务车型id（扫码下单不用上传）", name = "serverCarModelId", required = false, dataType = "int"),
@@ -79,18 +140,21 @@
@ApiImplicitParam(value = "乘客姓名（代下单必传）", name = "passengers", required = false, dataType = "string"),
@ApiImplicitParam(value = "乘客电话（代下单必传）", name = "passengersPhone", required = false, dataType = "string"),
@ApiImplicitParam(value = "预估价", name = "estimatedPrice", required = false, dataType = "BigDecimal"),
+ @ApiImplicitParam(value = "城市code", name = "cityCode", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "钱下标", name = "carIndex", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<BaseWarpper> saveOrderPrivateCar(Integer serverCarModelId, Date travelTime, Integer orderType, Integer substitute, String placementLon, String placementLat, String startLon, String startLat,
String startAddress, String endLon, String endLat, String endAddress, String passengers, String passengersPhone, Integer orderSource, Integer driverId,
- Integer type, BigDecimal estimatedPrice, HttpServletRequest request){
+ Integer type, BigDecimal estimatedPrice, String cityCode, Integer carIndex, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
return orderPrivateCarService.saveOrderPrivateCar(serverCarModelId, travelTime, orderType, substitute, placementLon, placementLat,
- startLon, startLat, startAddress, endLon, endLat, endAddress, passengers, passengersPhone, orderSource, driverId, type, uid,estimatedPrice);
+ startLon, startLat, startAddress, endLon, endLat, endAddress, passengers, passengersPhone, orderSource, driverId, type,
+ uid,estimatedPrice,cityCode,carIndex);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1