From 32f02d85b75f94ae0b704c7be059c5b0ff043095 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 15 四月 2024 09:48:17 +0800
Subject: [PATCH] 修改配置
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 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 9288b23..835bc67 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
@@ -248,14 +248,14 @@
map.put("name", language == 1 ? "打车订单取消" : language == 2 ? "Ride order cancelled" : "Commande de trajet annulée");
}
if(4 == orderType){
- map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Parcel order cancellation" : "Annulation de commande de colis");
+ map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Parcel order cancellation" : "Annulation de commande de livraison");
}
}
List<Map<String, Object>> list = orderPrivateCarService.queryMyTravelRecord(language, uid);//专车
for (Map<String, Object> map : list) {
map.put("name", name);
}
- name = language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison";
+ name = language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison";
List<Map<String, Object>> list3 = orderLogisticsService.queryMyTravelRecord(language, uid);//小件物流
for (Map<String, Object> map : list3) {
map.put("name", name);
@@ -461,14 +461,14 @@
map.put("driverPhone", map.get("telX"));
}
OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
- String driverName = orderInfoWarpper.getDriverName();
- if(language == 2){
- driverName = "Master " + driverName.replace("师傅", "");
- }
- if(language == 3){
- driverName = "Maître " + driverName.replace("师傅", "");
- }
- orderInfoWarpper.setDriverName(driverName);
+// String driverName = orderInfoWarpper.getDriverName();
+// if(language == 2){
+// driverName = "Master " + driverName.replace("师傅", "");
+// }
+// if(language == 3){
+// driverName = "Maître " + driverName.replace("师傅", "");
+// }
+// orderInfoWarpper.setDriverName(driverName);
File file = new File(filePath + orderId + "_1.txt");
if(file.exists()){
@@ -529,14 +529,14 @@
map.put("driverPhone", map.get("telX"));
}
OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
- String driverName = orderInfoWarpper.getDriverName();
- if(language == 2){
- driverName = "Master " + driverName.replace("师傅", "");
- }
- if(language == 3){
- driverName = "Maître " + driverName.replace("师傅", "");
- }
- orderInfoWarpper.setDriverName(driverName);
+// String driverName = orderInfoWarpper.getDriverName();
+// if(language == 2){
+// driverName = "Master " + driverName.replace("师傅", "");
+// }
+// if(language == 3){
+// driverName = "Maître " + driverName.replace("师傅", "");
+// }
+// orderInfoWarpper.setDriverName(driverName);
return ResultUtil.success(orderInfoWarpper);
}catch (Exception e){
e.printStackTrace();
@@ -582,14 +582,14 @@
break;
}
OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
- String driverName = orderInfoWarpper.getDriverName();
- if(language == 2){
- driverName = "Master " + driverName.replace("师傅", "");
- }
- if(language == 3){
- driverName = "Maître " + driverName.replace("师傅", "");
- }
- orderInfoWarpper.setDriverName(driverName);
+// String driverName = orderInfoWarpper.getDriverName();
+// if(language == 2){
+// driverName = "Master " + driverName.replace("师傅", "");
+// }
+// if(language == 3){
+// driverName = "Maître " + driverName.replace("师傅", "");
+// }
+// orderInfoWarpper.setDriverName(driverName);
return ResultUtil.success(orderInfoWarpper);
}catch (Exception e){
e.printStackTrace();
@@ -1105,9 +1105,9 @@
// case 3:
// list = orderCrossCityService.queryCoupon(orderId, uid, pageNum, size);
// break;
-// case 4:
-// list = orderLogisticsService.queryCoupon(orderId, uid, pageNum, size);
-// break;
+ case 4:
+ list = orderLogisticsService.queryCoupon(language,orderId, uid, pageNum, size);
+ break;
// case 5:
// list = orderLogisticsService.queryCoupon(orderId, uid, pageNum, size);
// break;
@@ -1155,7 +1155,7 @@
// case 3:
// return orderCrossCityService.payCrossCityOrder(payType, orderId, couponId, type);
case 4:
- return orderLogisticsService.payLogisticsOrder(payType, bankCardId, orderId, type, language);
+ return orderLogisticsService.payLogisticsOrder(payType, bankCardId, orderId,couponId, type, language);
// case 5:
// return orderLogisticsService.payLogisticsOrder(payType, orderId, type, language);
}
--
Gitblit v1.7.1