From e28d33c09405e246a2d75fcb1f69a9e8e9d911b8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 29 九月 2022 09:07:31 +0800
Subject: [PATCH] 更新最新代码
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 92 ++++++++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 47 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 4c810bb..de10aa0 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -237,8 +237,8 @@
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> maps = orderCancelService.queryCancel(uid, 2);
List<Map<String, Object>> list = orderPrivateCarService.queryMyTravelRecord(uid);//专车
- List<Map<String, Object>> list1 = orderTaxiService.queryMyTravelRecord(uid);//出租车
- List<Map<String, Object>> list2 = orderCrossCityService.queryMyTravelRecord(uid);//跨城车
+// List<Map<String, Object>> list1 = orderTaxiService.queryMyTravelRecord(uid);//出租车
+// List<Map<String, Object>> list2 = orderCrossCityService.queryMyTravelRecord(uid);//跨城车
List<Map<String, Object>> list3 = orderLogisticsService.queryMyTravelRecord(uid);//小件物流
List<TransactionDetails> transactionDetails = transactionDetailsService.selectList(new EntityWrapper<TransactionDetails>().eq("state", 1)
.eq("type", 1).eq("userType", 1).eq("userId", uid).eq("orderType", 3).like("remark", "%跨城订单取消退款%"));
@@ -253,10 +253,10 @@
list4.add(map);
}
list.addAll(maps);
- list.addAll(list1);
- list.addAll(list2);
+// list.addAll(list1);
+// list.addAll(list2);
list.addAll(list3);
- list.addAll(list4);
+// list.addAll(list4);
List<TravelRecordWarpper> orderWarpper = TravelRecordWarpper.getTravelRecordWarpper(list);
@@ -318,35 +318,35 @@
case 1://专车
list = orderPrivateCarService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
break;
- case 2://出租车
- list = orderTaxiService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
- break;
- case 3://跨城
- list = orderCrossCityService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
- break;
+// case 2://出租车
+// list = orderTaxiService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
+// break;
+// case 3://跨城
+// list = orderCrossCityService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
+// break;
case 4://同城小件物流
list = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
break;
- case 5://跨城小件物流
- list = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
- break;
+// case 5://跨城小件物流
+// list = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
+// break;
}
}else{
//专车
List<Map<String, Object>> maps = orderPrivateCarService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
list.addAll(maps);
- //出租车
- List<Map<String, Object>> list1 = orderTaxiService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
- list.addAll(list1);
- //跨城
- List<Map<String, Object>> list2 = orderCrossCityService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
- list.addAll(list2);
+// //出租车
+// List<Map<String, Object>> list1 = orderTaxiService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
+// list.addAll(list1);
+// //跨城
+// List<Map<String, Object>> list2 = orderCrossCityService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
+// list.addAll(list2);
//同城小件物流
List<Map<String, Object>> list3 = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
list.addAll(list3);
- //跨城小件物流
- List<Map<String, Object>> list4 = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
- list.addAll(list4);
+// //跨城小件物流
+// List<Map<String, Object>> list4 = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
+// list.addAll(list4);
}
//分页
@@ -378,13 +378,18 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "int"),
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "语言类型（1=简体中文，2=英语，3=法语）", name = "language", required = false, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil pushOrderTaxi(Integer id, Integer orderType){
+ public ResultUtil pushOrderTaxi(Integer id, Integer orderType, Integer language, HttpServletRequest request){
try {
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
switch (orderType){
case 1:
- return orderPrivateCarService.pushOrderPrivateCar(id);
+ return orderPrivateCarService.pushOrderPrivateCar(uid, id, language);
case 2:
return orderTaxiService.pushOrderTaxi(id);
}
@@ -824,9 +829,10 @@
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "取消原因", name = "reason", required = true, dataType = "string"),
@ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "语言类型（1=简体中文，2=英语，3=法语）", name = "language", required = false, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil addCancle(Integer id, Integer orderType, String reason, String remark, HttpServletRequest request){
+ public ResultUtil addCancle(Integer id, Integer orderType, String reason, String remark, Integer language, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
@@ -834,17 +840,17 @@
}
switch (orderType){
case 1:
- return orderPrivateCarService.addCancle(id, reason, remark, uid);
- case 2:
- return orderTaxiService.addCancle(id, reason, remark, uid);
- case 3:
- return orderCrossCityService.addCancle(id, reason, remark, uid);
+ return orderPrivateCarService.addCancle(id, reason, remark, uid, language);
+// case 2:
+// return orderTaxiService.addCancle(id, reason, remark, uid);
+// case 3:
+// return orderCrossCityService.addCancle(id, reason, remark, uid);
case 4:
- return orderLogisticsService.addCancle(id, reason, remark, uid);
- case 5:
- return orderLogisticsService.addCancle(id, reason, remark, uid);
- case 6:
- return orderCharteredCarService.addCancle(id, reason, remark, uid);
+ return orderLogisticsService.addCancle(id, reason, remark, uid, language);
+// case 5:
+// return orderLogisticsService.addCancle(id, reason, remark, uid);
+// case 6:
+// return orderCharteredCarService.addCancle(id, reason, remark, uid);
}
return ResultUtil.success();
}catch (Exception e){
@@ -910,15 +916,16 @@
@ApiImplicitParam(value = "司机id", name = "driverId", required = true, dataType = "int"),
@ApiImplicitParam(value = "投诉原因", name = "reason", required = true, dataType = "String"),
@ApiImplicitParam(value = "投诉描述", name = "description", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "语言类型（1=简体中文，2=英语，3=法语）", name = "language", required = false, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil complaintService(Integer driverId, String reason, String description, HttpServletRequest request){
+ public ResultUtil complaintService(Integer driverId, String reason, String description, Integer language, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- complaintService.saveData(driverId, reason, description, uid);
+ complaintService.saveData(driverId, reason, description, uid, language);
return ResultUtil.success();
}catch (Exception e){
e.printStackTrace();
@@ -1098,15 +1105,6 @@
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
orderPrivateCar.setState(9);
orderPrivateCarService.updateById(orderPrivateCar);
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传数据
- pushMinistryOfTransportUtil.ratedPassenger(Integer.valueOf(resultUtil.getData().toString()));
- pushMinistryOfTransportUtil.ratedDriver(orderPrivateCar.getDriverId());
- }
- }
- }).start();
break;
case 2:
OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
--
Gitblit v1.7.1