From 1e4181e2131350b15fd5538532331e333631c64f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 20 七月 2023 18:00:54 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java | 6
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java | 6
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java | 4
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 20 ++--
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java | 8 +
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 12 +-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 48 ++++++------
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 16 ++--
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 15 ++-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java | 8 +
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 13 +-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java | 8 +-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 28 +++---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 12 +-
14 files changed, 105 insertions(+), 99 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 97f1fe5..6d4c164 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -625,13 +625,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil queryHomeNum(HttpServletRequest request){
+ public ResultUtil queryHomeNum(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- Map<String, Object> map = driverService.queryHomeNum(uid);
+ Map<String, Object> map = driverService.queryHomeNum(uid, language);
return ResultUtil.success(map);
}catch (Exception e){
e.printStackTrace();
@@ -652,14 +652,14 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<BaseWarpper>> queryMyBusiness(HttpServletRequest request){
+ public ResultUtil<List<BaseWarpper>> queryMyBusiness(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
// TODO: 2020/7/21 修改为个人中心中设置的接单业务类型。
- List<BaseWarpper> list = driverService.queryMyBusiness(uid);
+ List<BaseWarpper> list = driverService.queryMyBusiness(uid, language);
List<Integer> integers = driverOrdersService.queryOrders(uid);
List<BaseWarpper> data = new ArrayList<>();
@@ -843,13 +843,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<OrdersWarpper>> querySetOrders(HttpServletRequest request){
+ public ResultUtil<List<OrdersWarpper>> querySetOrders(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<BaseWarpper> list = driverService.queryMyBusiness(uid);
+ List<BaseWarpper> list = driverService.queryMyBusiness(uid, language);
List<Integer> integers = driverOrdersService.queryOrders(uid);
List<OrdersWarpper> data = new ArrayList<>();
for(BaseWarpper b : list){
@@ -1028,7 +1028,7 @@
@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<BaseWarpper>> queryActivityIncome(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<BaseWarpper>> queryActivityIncome(Integer pageNum, Integer size, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
@@ -1040,7 +1040,7 @@
BaseWarpper baseWarpper = new BaseWarpper();
baseWarpper.setDay(String.valueOf(null != map.get("time") ? map.get("time") : ""));
baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
- baseWarpper.setName("活动奖励");
+ baseWarpper.setName(language == 1 ? "活动奖励" : language == 2 ? "Activity reward" : "Récompenses pour événements");
data.add(baseWarpper);
}
return ResultUtil.success(data);
@@ -1066,7 +1066,7 @@
@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<BaseWarpper>> queryTotalRevenue(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<BaseWarpper>> queryTotalRevenue(Integer pageNum, Integer size, Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
@@ -1080,19 +1080,19 @@
baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
switch (Integer.valueOf(String.valueOf(null != map.get("orderType") ? map.get("orderType") : 0))){
case 1:
- baseWarpper.setName("专车");
+ baseWarpper.setName(language == 1 ? "专车" : language == 2 ? "Special car" : "véhicules");
break;
case 2:
- baseWarpper.setName("出租车");
+ baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
break;
case 3:
- baseWarpper.setName("城际出行");
+ baseWarpper.setName(language == 1 ? "城际出行" : language == 2 ? "Intercity travel" : "Mobilité entre villes");
break;
case 4:
- baseWarpper.setName("市内小件物流");
+ baseWarpper.setName(language == 1 ? "市内小件物流" : language == 2 ? "Small parts logistics in the city" : "Logistique de petites pièces dans la ville");
break;
case 5:
- baseWarpper.setName("跨城小件物流");
+ baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
break;
}
Map<String, Object> map1 = new HashMap<>();
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..18ddfba 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);
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java
index 1bb7bfa..77e168c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java
@@ -16,7 +16,7 @@
* @param orderId
* @return
*/
- Map<String, Object> queryPushOrder(@Param("orderId") Integer orderId);
+ Map<String, Object> queryPushOrder(@Param("orderId") Integer orderId, @Param("language") Integer language);
@@ -33,7 +33,8 @@
* @param driverId
* @return
*/
- List<Map<String, Object>> queryOrderList(@Param("driverId") Integer driverId);
+ List<Map<String, Object>> queryOrderList(@Param("driverId") Integer driverId,
+ @Param("language") Integer language);
/**
@@ -42,7 +43,8 @@
* @param uid
* @return
*/
- List<Map<String, Object>> queryMyAllOrder(@Param("state") Integer state, @Param("uid") Integer uid);
+ List<Map<String, Object>> queryMyAllOrder(@Param("state") Integer state, @Param("uid") Integer uid,
+ @Param("language") Integer language);
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
index 2861654..f5e2eec 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
@@ -75,7 +75,7 @@
select
a.id as id,
a.state as orderState,
- if(a.type = 4, '市内小件物流订单', '跨城小件物流订单') as orderName,
+ if(#{language} = 1, '市内小件物流订单', if(#{language} = 2, 'Small parts logistics orders in the city', 'Commandes logistiques de petites pièces dans la ville')) as orderName,
DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime,
a.startAddress as startAddress,
a.endAddress as endAddress,
@@ -105,7 +105,7 @@
a.userId as userId,
a.driverId as driverId,
a.state as orderState,
- DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime_,
+ DATE_FORMAT(a.travelTime, '%m-%d %H:%i') as travelTime_,
DATE_FORMAT(a.travelTime, '%Y-%m-%d %H:%i:%s') as travelTime,
DATE_FORMAT(a.arriveTime, '%Y-%m-%d %H:%i:%s') as arriveTime,
a.startAddress as startAddress,
@@ -116,6 +116,7 @@
a.endLat as endLat,
a.orderMoney as orderMoney,
a.payManner as payManner,
+ a.payMoney as payMoney,
a.trackId as trackId,
b.nickName as userName,
a.recipient as nickName,
@@ -143,13 +144,13 @@
select
id as id,
type as type,
- if(type = 4, '市内小件物流订单', '跨城小件物流订单') as `name`,
+ if(#{language} = 1, '市内小件物流订单', if(#{language} = 2, 'Small parts logistics orders in the city', 'Commandes logistiques de petites pièces dans la ville')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as `time`,
startAddress as startAddress,
endAddress as endAddress,
state as state,
CONCAT(recipient, '-', recipientPhone) as `user`,
- CONCAT(if(cargoType = 1, '普通货物 x ', '贵重货物 x '), cargoNumber) as cargoNumber,
+ CONCAT(if(#{language} = 1, if(cargoType = 1, '普通货物 x ', '贵重货物 x '), if(#{language} = 2, if(cargoType = 1, 'General cargo x ', 'Valuable cargo x '), if(cargoType = 1, 'Pour marchandises générales x ', 'Marchandises de valeur x '))), cargoNumber) as cargoNumber,
driverId as driverId
from t_order_logistics where 1 = 1
<if test="null != driverId">
@@ -164,13 +165,13 @@
select
id as id,
type as type,
- if(type = 4, '市内小件物流订单', '跨城小件物流订单') as `name`,
+ if(#{language} = 1, '市内小件物流订单', if(#{language} = 2, 'Small parts logistics orders in the city', 'Commandes logistiques de petites pièces dans la ville')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
state as state,
CONCAT(recipient, '-', recipientPhone) as `user`,
- CONCAT(if(cargoType = 1, '普通货物 x ', '贵重货物 x '), cargoNumber) as cargoNumber,
+ CONCAT(if(#{language} = 1, if(cargoType = 1, '普通货物 x ', '贵重货物 x '), if(#{language} = 2, if(cargoType = 1, 'General cargo x ', 'Valuable cargo x '), if(cargoType = 1, 'Pour marchandises générales x ', 'Marchandises de valeur x '))), cargoNumber) as cargoNumber,
orderMoney as orderMoney,
payManner as payManner,
UNIX_TIMESTAMP(travelTime) as travelTime,
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
index b19a3aa..db4f0d2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
@@ -17,7 +17,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryPushOrder(Integer orderId) throws Exception;
+ Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception;
@@ -79,7 +79,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryOrderList(Integer driverId) throws Exception;
+ List<Map<String, Object>> queryOrderList(Integer driverId, Integer language) throws Exception;
@@ -90,7 +90,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception;
+ List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index ef19b9c..98ceb7d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -95,8 +95,8 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryPushOrder(Integer orderId) throws Exception {
- return orderLogisticsMapper.queryPushOrder(orderId);
+ public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
+ return orderLogisticsMapper.queryPushOrder(orderId, language);
}
@@ -310,8 +310,8 @@
}
@Override
- public List<Map<String, Object>> queryOrderList(Integer driverId) throws Exception {
- return orderLogisticsMapper.queryOrderList(driverId);
+ public List<Map<String, Object>> queryOrderList(Integer driverId, Integer language) throws Exception {
+ return orderLogisticsMapper.queryOrderList(driverId, language);
}
/**
@@ -322,8 +322,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
- return orderLogisticsMapper.queryMyAllOrder(state, uid);
+ public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
+ return orderLogisticsMapper.queryMyAllOrder(state, uid, language);
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java
index 9347446..7f1c75f 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java
@@ -17,7 +17,8 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryOrderList(@Param("state") Integer state, @Param("driverId") Integer driverId);
+ List<Map<String, Object>> queryOrderList(@Param("state") Integer state, @Param("driverId") Integer driverId,
+ @Param("language") Integer language);
@@ -29,7 +30,8 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryMyAllOrder(@Param("state") Integer state, @Param("driverId") Integer driverId);
+ List<Map<String, Object>> queryMyAllOrder(@Param("state") Integer state, @Param("driverId") Integer driverId,
+ @Param("language") Integer language);
@@ -38,7 +40,7 @@
* @param orderId
* @return
*/
- Map<String, Object> queryPushOrder(@Param("orderId") Integer orderId);
+ Map<String, Object> queryPushOrder(@Param("orderId") Integer orderId, @Param("language") Integer language);
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
index a1b69f2..4a82b0d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
@@ -98,7 +98,7 @@
select
id as id,
(1) as type,
- ('专车订单') as `name`,
+ if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
@@ -116,7 +116,7 @@
select
id as id,
(1) as type,
- ('专车订单') as `name`,
+ if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
@@ -133,7 +133,7 @@
select
id as id,
(1) as type,
- ('专车订单') as `name`,
+ if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
@@ -155,7 +155,7 @@
select
id as id,
(1) as type,
- ('专车订单') as `name`,
+ if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
@@ -188,8 +188,8 @@
select
id as orderId,
state as orderState,
- ('专车订单') as orderName,
- DATE_FORMAT(travelTime, '%m月%d日 %H:%i') as travelTime,
+ if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as orderName,
+ DATE_FORMAT(travelTime, '%m-%d %H:%i') as travelTime,
startAddress as startAddress,
endAddress as endAddress,
startLon as startLon,
@@ -213,7 +213,7 @@
a.userId as userId,
a.driverId as driverId,
a.state as orderState,
- DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime_,
+ DATE_FORMAT(a.travelTime, '%m-%d %H:%i') as travelTime_,
DATE_FORMAT(a.travelTime, '%Y-%m-%d %H:%i:%s') as travelTime,
DATE_FORMAT(a.arriveTime, '%Y-%m-%d %H:%i:%s') as arriveTime,
a.startAddress as startAddress,
@@ -224,6 +224,7 @@
a.endLat as endLat,
a.orderMoney as orderMoney,
a.payManner as payManner,
+ a.payMoney as payMoney,
a.trackId as trackId,
b.nickName as nickName,
a.passengersPhone as phone,
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
index dc35d3f..0d934d6 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
@@ -20,7 +20,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception;
+ List<Map<String, Object>> queryOrderList(Integer state, Integer driverId, Integer language) throws Exception;
@@ -32,7 +32,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception;
+ List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception;
@@ -43,7 +43,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryPushOrder(Integer orderId) throws Exception;
+ Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception;
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 3bba9fb..3476154 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -101,8 +101,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception {
- return orderPrivateCarMapper.queryOrderList(state, driverId);
+ public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId, Integer language) throws Exception {
+ return orderPrivateCarMapper.queryOrderList(state, driverId, language);
}
/**
@@ -113,8 +113,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
- return orderPrivateCarMapper.queryMyAllOrder(state, uid);
+ public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
+ return orderPrivateCarMapper.queryMyAllOrder(state, uid, language);
}
@@ -125,8 +125,8 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryPushOrder(Integer orderId) throws Exception {
- return orderPrivateCarMapper.queryPushOrder(orderId);
+ public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
+ return orderPrivateCarMapper.queryPushOrder(orderId, language);
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
index 169b98f..56a5ea2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
@@ -152,7 +152,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryHomeNum(Integer uid) throws Exception;
+ Map<String, Object> queryHomeNum(Integer uid, Integer language) throws Exception;
/**
@@ -161,7 +161,7 @@
* @return
* @throws Exception
*/
- List<BaseWarpper> queryMyBusiness(Integer uid) throws Exception;
+ List<BaseWarpper> queryMyBusiness(Integer uid, Integer language) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
index 24cf782..cac8617 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
@@ -16,7 +16,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryOrderList(Integer state, Integer pageNum, Integer size, Integer uid) throws Exception;
+ List<Map<String, Object>> queryOrderList(Integer state, Integer pageNum, Integer size, Integer uid, Integer language) throws Exception;
/**
@@ -25,7 +25,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryOrderList1(Integer state, Integer type, Integer pageNum, Integer size, Integer uid) throws Exception;
+ List<Map<String, Object>> queryOrderList1(Integer state, Integer type, Integer pageNum, Integer size, Integer uid, Integer language) throws Exception;
/**
@@ -37,7 +37,7 @@
* @return
* @throws Exception
*/
- List<OrderListWarpper> queryMyAllOrder(Integer state, Integer pageNum, Integer size, Integer uid) throws Exception;
+ List<OrderListWarpper> queryMyAllOrder(Integer state, Integer pageNum, Integer size, Integer uid, Integer language) throws Exception;
/**
@@ -47,7 +47,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryPushOrder(Integer orderId, Integer orderType, String lon, String lat) throws Exception;
+ Map<String, Object> queryPushOrder(Integer orderId, Integer orderType, String lon, String lat, Integer language) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index de5520d..a9a29c9 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -818,7 +818,7 @@
Driver driver = this.selectById(uid);
if(null != driverWork){//作下班操作
//检测是否有未完成的订单
- List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
+ List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
if(list.size() > 0){
return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées");
}
@@ -883,7 +883,7 @@
Driver driver = this.selectById(uid);
if(null != driverWork){//作下班操作
//检测是否有未完成的订单
- List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
+ List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
if(list.size() > 0){
return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées");
}
@@ -941,14 +941,14 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryHomeNum(Integer uid) throws Exception {
+ public Map<String, Object> queryHomeNum(Integer uid, Integer language) throws Exception {
Map<String, Object> map = new HashMap<>();
//出租车
List<Map<String, Object>> list = orderTaxiService.queryOrderList(1, uid);
map.put("service", list.size());//服务中
list = orderTaxiService.queryOrderList(2, uid);
map.put("reservation", list.size());//预约
- List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid);
+ List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid, language);
map.put("small", list1.size());//小件
int size = this.queryMyActivity(uid, new Date()).size();
map.put("activity", size);//活动
@@ -963,7 +963,7 @@
* @throws Exception
*/
@Override
- public List<BaseWarpper> queryMyBusiness(Integer uid) throws Exception {
+ public List<BaseWarpper> queryMyBusiness(Integer uid, Integer language) throws Exception {
List<DriverService> list = driverServiceMapper.queryMyBusiness(uid);
List<BaseWarpper> maps = new ArrayList<>();
for (DriverService d : list){
@@ -971,19 +971,19 @@
baseWarpper.setId(d.getType());
switch (d.getType()){
case 1:
- baseWarpper.setName("专车");
+ baseWarpper.setName(language == 1 ? "专车" : language == 2 ? "Special car" : "véhicules");
break;
case 2:
- baseWarpper.setName("出租车");
+ baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
break;
case 3:
- baseWarpper.setName("跨城出行");
+ baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "Cross-town travel" : "Se déplacer à travers la ville");
break;
case 4:
- baseWarpper.setName("市内小件物流");
+ baseWarpper.setName(language == 1 ? "市内小件物流" : language == 2 ? "Small parts logistics in the city" : "Logistique de petites pièces dans la ville");
break;
case 5:
- baseWarpper.setName("跨城小件物流");
+ baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
break;
}
maps.add(baseWarpper);
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 34e2751..1d8badf 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -110,20 +110,20 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryOrderList(Integer state, Integer pageNum, Integer size, Integer uid) throws Exception {
+ public List<Map<String, Object>> queryOrderList(Integer state, Integer pageNum, Integer size, Integer uid, Integer language) throws Exception {
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> datas = new ArrayList<>();
//出租车
// List<Map<String, Object>> list = orderTaxiService.queryOrderList(state, uid);
// datas.addAll(list);
//专车
- List<Map<String, Object>> list1 = orderPrivateCarService.queryOrderList(state, uid);
+ List<Map<String, Object>> list1 = orderPrivateCarService.queryOrderList(state, uid, language);
datas.addAll(list1);
//跨城
// List<Map<String, Object>> list2 = orderCrossCityService.queryOrderList(state, uid);
// datas.addAll(list2);
//小件物流
- List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid);
+ List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid, language);
datas.addAll(list3);
//分页
@@ -149,7 +149,7 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryOrderList1(Integer state, Integer type, Integer pageNum, Integer size, Integer uid) throws Exception {
+ public List<Map<String, Object>> queryOrderList1(Integer state, Integer type, Integer pageNum, Integer size, Integer uid, Integer language) throws Exception {
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> datas = new ArrayList<>();
if(type == 1){
@@ -157,13 +157,13 @@
List<Map<String, Object>> list = orderTaxiService.queryOrderList(state, uid);
datas.addAll(list);
//专车
- List<Map<String, Object>> list1 = orderPrivateCarService.queryOrderList(state, uid);
+ List<Map<String, Object>> list1 = orderPrivateCarService.queryOrderList(state, uid, language);
datas.addAll(list1);
//跨城
List<Map<String, Object>> list2 = orderCrossCityService.queryOrderList(state, uid);
datas.addAll(list2);
}else{//小件物流
- List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid);
+ List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid, language);
datas.addAll(list3);
}
@@ -191,20 +191,20 @@
* @throws Exception
*/
@Override
- public List<OrderListWarpper> queryMyAllOrder(Integer state, Integer pageNum, Integer size, Integer uid) throws Exception {
+ public List<OrderListWarpper> queryMyAllOrder(Integer state, Integer pageNum, Integer size, Integer uid, Integer language) throws Exception {
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> datas = new ArrayList<>();
//出租车
// List<Map<String, Object>> list = orderTaxiService.queryMyAllOrder(state, uid);
// datas.addAll(list);
//专车
- List<Map<String, Object>> list1 = orderPrivateCarService.queryMyAllOrder(state, uid);
+ List<Map<String, Object>> list1 = orderPrivateCarService.queryMyAllOrder(state, uid, language);
datas.addAll(list1);
//跨城
// List<Map<String, Object>> list2 = orderCrossCityService.queryMyAllOrder(state, uid);
// datas.addAll(list2);
//小件物流
- List<Map<String, Object>> list3 = orderLogisticsService.queryMyAllOrder(state, uid);
+ List<Map<String, Object>> list3 = orderLogisticsService.queryMyAllOrder(state, uid, language);
datas.addAll(list3);
List<OrderListWarpper> orderListWarpper = OrderListWarpper.getOrderListWarpper(datas);
@@ -229,11 +229,11 @@
* @return
*/
@Override
- public Map<String, Object> queryPushOrder(Integer orderId, Integer orderType, String lon, String lat) throws Exception{
+ public Map<String, Object> queryPushOrder(Integer orderId, Integer orderType, String lon, String lat, Integer language) throws Exception{
Map<String, Object> map = null;
switch (orderType){
case 1://专车
- map = orderPrivateCarService.queryPushOrder(orderId);
+ map = orderPrivateCarService.queryPushOrder(orderId, language);
DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(map.get("startLat").toString()), Double.valueOf(map.get("startLon").toString()), Double.valueOf(lat), Double.valueOf(lon));
map.put("startDistance", null != distancematrix ? distancematrix.getDistance() / 1000 : 0);
@@ -244,30 +244,30 @@
Integer orderSource = Integer.valueOf(String.valueOf(map.get("orderSource")));
if(orderSource == 1 || orderSource == 2 || orderSource == 3){
if(Integer.valueOf(String.valueOf(map.get("orderType"))) == 1 && Integer.valueOf(String.valueOf(map.get("isReassign"))) == 1){
- map.put("type", "乘客创建");
+ map.put("type", language == 1 ? "乘客创建" : language == 2 ? "Passenger creation" : "Créé par passager");
}
if(Integer.valueOf(String.valueOf(map.get("orderType"))) == 1 && Integer.valueOf(String.valueOf(map.get("isReassign"))) == 2){
- map.put("type", "改派");
+ map.put("type", language == 1 ? "改派" : language == 2 ? "reassignment" : "recruté");
}
if(Integer.valueOf(String.valueOf(map.get("orderType"))) == 2 && Integer.valueOf(String.valueOf(map.get("isReassign"))) == 1){
- map.put("type", "预约");
+ map.put("type", language == 1 ? "预约" : language == 2 ? "Make an appointment" : "rendez-vous");
}
if(Integer.valueOf(String.valueOf(map.get("orderType"))) == 2 && Integer.valueOf(String.valueOf(map.get("isReassign"))) == 2){
- map.put("type", "改派");
+ map.put("type", language == 1 ? "改派" : language == 2 ? "reassignment" : "recruté");
}
}
if(orderSource == 5){
if(Integer.valueOf(String.valueOf(map.get("orderType"))) == 1 && Integer.valueOf(String.valueOf(map.get("isReassign"))) == 1){
- map.put("type", "调度创建");
+ map.put("type", language == 1 ? "调度创建" : language == 2 ? "Scheduling creation" : "Création de planning");
}
if(Integer.valueOf(String.valueOf(map.get("orderType"))) == 1 && Integer.valueOf(String.valueOf(map.get("isReassign"))) == 2){
- map.put("type", "改派");
+ map.put("type", language == 1 ? "改派" : language == 2 ? "reassignment" : "recruté");
}
if(Integer.valueOf(String.valueOf(map.get("orderType"))) == 2 && Integer.valueOf(String.valueOf(map.get("isReassign"))) == 1){
- map.put("type", "预约");
+ map.put("type", language == 1 ? "预约" : language == 2 ? "Make an appointment" : "rendez-vous");
}
if(Integer.valueOf(String.valueOf(map.get("orderType"))) == 2 && Integer.valueOf(String.valueOf(map.get("isReassign"))) == 2){
- map.put("type", "改派");
+ map.put("type", language == 1 ? "改派" : language == 2 ? "reassignment" : "recruté");
}
}
break;
@@ -342,7 +342,7 @@
// }
break;
case 4://市内小件物流
- map = orderLogisticsService.queryPushOrder(orderId);
+ map = orderLogisticsService.queryPushOrder(orderId, language);
DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(Double.valueOf(map.get("startLat").toString()), Double.valueOf(map.get("startLon").toString()), Double.valueOf(lat), Double.valueOf(lon));
map.put("startDistance", null != distancematrix1 ? distancematrix1.getDistance() / 1000 : 0);
@@ -353,18 +353,18 @@
Integer orderSource3 = Integer.valueOf(String.valueOf(map.get("orderSource")));
if(orderSource3 == 1 || orderSource3 == 2 || orderSource3 == 3){
if(Integer.valueOf(String.valueOf(map.get("isReassign"))) == 1){
- map.put("type", "乘客创建");
+ map.put("type", language == 1 ? "乘客创建" : language == 2 ? "Passenger creation" : "Créé par passager");
}
if(Integer.valueOf(String.valueOf(map.get("isReassign"))) == 2){
- map.put("type", "改派");
+ map.put("type", language == 1 ? "改派" : language == 2 ? "reassignment" : "recruté");
}
}
if(orderSource3 == 5){
if(Integer.valueOf(String.valueOf(map.get("isReassign"))) == 1){
- map.put("type", "调度创建");
+ map.put("type", language == 1 ? "调度创建" : language == 2 ? "Scheduling creation" : "Création de planning");
}
if(Integer.valueOf(String.valueOf(map.get("isReassign"))) == 2){
- map.put("type", "改派");
+ map.put("type", language == 1 ? "改派" : language == 2 ? "reassignment" : "recruté");
}
}
break;
--
Gitblit v1.7.1