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/dao/mapping/OrderLogisticsMapper.xml | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) 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, -- Gitblit v1.7.1