From 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 01 二月 2024 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 18ddfba..e81958f 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -238,15 +238,15 @@
*/
@ResponseBody
@PostMapping("/api/order/queryOrderInfo")
- @ApiOperation(value = "获取服务中页面订单详情", tags = {"司机端-服务中"}, notes = "")
+ @ApiOperation(value = "获取服务中页面订单详情", tags = {"司机端-服务中"}, notes = "",response = OrderInfoWarpper.class)
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
@ApiImplicitParam(value = "订单类型（1=专车，4=小件物流-同城）", 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){
+ public ResultUtil<OrderInfoWarpper> queryOrderInfo(Integer language, Integer orderId, Integer orderType){
try {
- Map<String, Object> map = orderService.queryOrderInfo(orderId, orderType);
+ Map<String, Object> map = orderService.queryOrderInfo(language, orderId, orderType);
OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
File file = new File(filePath + orderId + "_" + orderType + ".txt");
if(file.exists()){
@@ -424,9 +424,9 @@
@ApiImplicitParam(value = "过路费", name = "crossingFee", required = false, dataType = "double"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil confirmFees(Integer orderId, Integer orderType, Integer type, Double travelFee, Double parkingFee, Double crossingFee){
+ public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee, Double parkingFee, Double crossingFee){
try{
- return orderService.confirmFees(orderId, orderType, type, travelFee, parkingFee, crossingFee);
+ return orderService.confirmFees(language, orderId, orderType, type, travelFee, parkingFee, crossingFee);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -481,9 +481,9 @@
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<OrderInfoWarpper> queryToBePaidPage(Integer orderId, Integer orderType){
+ public ResultUtil<OrderInfoWarpper> queryToBePaidPage(Integer language, Integer orderId, Integer orderType){
try {
- Map<String, Object> map = orderService.queryToBePaidPage(orderId, orderType);
+ Map<String, Object> map = orderService.queryToBePaidPage(language, orderId, orderType);
return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
@@ -500,9 +500,9 @@
*/
@ResponseBody
@PostMapping("/base/order/pushOrderState")
- public String pushOrderState(Integer orderId, Integer orderType){
+ public String pushOrderState(Integer language, Integer orderId, Integer orderType){
try {
- Map<String, Object> map = orderService.queryOrderInfo(orderId, orderType);
+ Map<String, Object> map = orderService.queryOrderInfo(language, orderId, orderType);
//更新小号绑定关系
orderService.RebindMidAxbBindSend(orderId, orderType);
--
Gitblit v1.7.1