From ddcef762ff4a159e132c68dfec512c60a68a53e6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 十二月 2023 18:21:24 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 2fffb83..79e48ac 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
@@ -88,13 +88,13 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<OrderListWarpper>> queryOrderList(Integer state, Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<OrderListWarpper>> queryOrderList(Integer state, Integer pageNum, Integer size, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = orderService.queryOrderList(state, pageNum, size, uid);
+ List<Map<String, Object>> list = orderService.queryOrderList(state, pageNum, size, uid, language);
return ResultUtil.success(OrderListWarpper.getOrderListWarpper(list));
}catch (Exception e){
e.printStackTrace();
@@ -121,13 +121,13 @@
@ApiImplicitParam(value = "订单类型（1=其他订单，2=小件物流）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<OrderListWarpper>> queryOrderList1(Integer state, Integer type, Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<OrderListWarpper>> queryOrderList1(Integer state, Integer type, Integer pageNum, Integer size, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = orderService.queryOrderList1(state, type, pageNum, size, uid);
+ List<Map<String, Object>> list = orderService.queryOrderList1(state, type, pageNum, size, uid, language);
return ResultUtil.success(OrderListWarpper.getOrderListWarpper(list));
}catch (Exception e){
e.printStackTrace();
@@ -156,13 +156,13 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<OrderListWarpper>> queryMyAllOrder(Integer state, Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<OrderListWarpper>> queryMyAllOrder(Integer state, Integer pageNum, Integer size, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<OrderListWarpper> listWarppers = orderService.queryMyAllOrder(state, pageNum, size, uid);
+ List<OrderListWarpper> listWarppers = orderService.queryMyAllOrder(state, pageNum, size, uid, language);
return ResultUtil.success(listWarppers);
}catch (Exception e){
e.printStackTrace();
@@ -189,9 +189,9 @@
@ApiImplicitParam(value = "当前定位纬度", name = "lat", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<OrderInfoWarpper> queryPushOrder(Integer orderId, Integer orderType, String lon, String lat){
+ public ResultUtil<OrderInfoWarpper> queryPushOrder(Integer orderId, Integer orderType, String lon, String lat, Integer language){
try {
- Map<String, Object> map = orderService.queryPushOrder(orderId, orderType, lon, lat);
+ Map<String, Object> map = orderService.queryPushOrder(orderId, orderType, lon, lat, language);
OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
orderInfoWarpper.setOrderPositionList("");
return ResultUtil.success(orderInfoWarpper);
@@ -244,9 +244,9 @@
@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()){
@@ -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