From 2f3d5e904ec44b807b35d4c1a9ceeeac590d8e90 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 05 二月 2024 14:47:59 +0800
Subject: [PATCH] 2.5
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..dae9c77 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);
@@ -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