From 57909bfeb70e80689cfe515198e3a30ad3868bb8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 07 八月 2024 09:35:28 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 ce2343c..5a7af6a 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
@@ -448,9 +448,14 @@
@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 language, 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, HttpServletRequest request){
try{
- return orderService.confirmFees(language, orderId, orderType, type, travelFee, parkingFee, crossingFee);
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return orderService.confirmFees(language, orderId, orderType, type, travelFee, parkingFee, crossingFee, uid);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -530,11 +535,11 @@
//更新小号绑定关系
orderService.RebindMidAxbBindSend(orderId, orderType);
- pushUtil.pushOrderReassign(Integer.valueOf(String.valueOf(map.get("driverId"))), 2,Integer.valueOf(String.valueOf(map.get("orderId"))), orderType);
+ pushUtil.pushOrderReassign(Integer.valueOf(String.valueOf(map.get("driverId"))), 2,Integer.valueOf(String.valueOf(map.get("orderId"))), orderType, "");
- pushUtil.pushOrderReassign(Integer.valueOf(String.valueOf(map.get("userId"))), 1,Integer.valueOf(String.valueOf(map.get("orderId"))), orderType);
+ pushUtil.pushOrderReassign(Integer.valueOf(String.valueOf(map.get("userId"))), 1,Integer.valueOf(String.valueOf(map.get("orderId"))), orderType, "");
pushUtil.pushOrderState(1, Integer.valueOf(String.valueOf(map.get("userId"))), Integer.valueOf(String.valueOf(map.get("orderId"))), orderType,
- Integer.valueOf(String.valueOf(map.get("orderState"))));
+ Integer.valueOf(String.valueOf(map.get("orderState"))), 0, "");
return JSON.toJSONString(ResultUtil.success());
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1