From dae4651a80ac06f432a2ff448a199afb6dc0d2b3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 十二月 2023 18:17:14 +0800
Subject: [PATCH] 更新
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 183 +++++++++++++++++++++++++--------------------
1 files changed, 102 insertions(+), 81 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index ae75ffa..ef2b83c 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -231,16 +231,16 @@
*/
List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
if(orderPrivateCars.size() > 0){
- return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
+ return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
}
List<OrderTaxi> list = orderTaxiMapper.queryByState_(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
if(list.size() > 0){
- return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
+ return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
}
orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
if(orderPrivateCars.size() > 0 && reservation == 2){
- return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
+ return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
}
orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 7,12);
@@ -254,7 +254,7 @@
list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
if(list.size() > 0 && reservation == 2){
- return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
+ return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
}
startAddress = startAddress.replaceAll("& #40;", "(");
@@ -262,7 +262,7 @@
endAddress = endAddress.replaceAll("& #40;", "(");
endAddress = endAddress.replaceAll("& #41;", ")");
if((orderSource == 1 || orderSource == 3) && null == serverCarModelId){
- return ResultUtil.error(language == 1 ? "请选择服务车型" : language == 2 ? "Please select the service model" : "Veuillez sélectionner un modèle de service");
+ return ResultUtil.error(language == 1 ? "请选择服务车型" : language == 2 ? "Please select vehicle-type" : "Veuillez sélectionner le type de véhicule");
}
OrderPrivateCar orderPrivateCar = new OrderPrivateCar();
@@ -287,7 +287,7 @@
if(instead == 0 || ToolUtil.isEmpty(orderPrivateCar.getPassengers())){
UserInfo userInfo = userInfoService.selectById(uid);
if(ToolUtil.isEmpty(userInfo.getPhone())){
- return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind the mobile phone number first" : "Veuillez d’abord lier le numéro de téléphone mobile");
+ return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
}
orderPrivateCar.setPassengers(userInfo.getFirstName() + "." + userInfo.getLastName());
orderPrivateCar.setPassengersPhone(userInfo.getPhone());
@@ -300,35 +300,35 @@
if(orderSource == 2){//扫码下单
Driver driver = driverService.selectById(driverId);
if(null == driver){
- return ResultUtil.error(language == 1 ? "司机信息有误，无法完成下单" : language == 2 ? "Incorrect driver information, unable to complete the order" : "Les informations du conducteur sont incorrectes pour compléter la commande");
+ return ResultUtil.error(language == 1 ? "司机信息有误，无法完成下单" : language == 2 ? "Wrong driver-information, unable to place an order." : "Informations erronées sur le chauffeur, il ne peut donc pas passer une commande.");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "司机信息还未完成审核，无法完成下单" : language == 2 ? "The driver information has not been reviewed, and the order cannot be completed" : "Les informations du conducteur n’ont pas été vérifiées et la commande n’a pas pu être finalisée");
+ return ResultUtil.error(language == 1 ? "司机信息还未完成审核，无法完成下单" : language == 2 ? "The driver is not yet done with review, unable to place an order." : "Le chauffeur n’a pas encore terminé son examen, il ne peut donc pas passer une commande.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "司机账户已被冻结，无法提供服务" : language == 2 ? "The driver's account has been frozen, unable to provide service" : "Le compte du conducteur a été bloqué et le service n’est pas disponible");
+ return ResultUtil.error(language == 1 ? "司机账户已被冻结，无法提供服务" : language == 2 ? "Driver account is frozen, unable to provide service." : "Le compte du chauffeur est gelé, il n’est donc pas possible de fournir des services.");
}
if(driver.getAuthState() == 4){
- return ResultUtil.error(language == 1 ? "司机信息未通过审核，无法提供服务" : language == 2 ? "Driver information has not passed the audit, unable to provide service" : "Les informations du conducteur n’ont pas été vérifiées et le service n’a pas pu être fourni");
+ return ResultUtil.error(language == 1 ? "司机信息未通过审核，无法提供服务" : language == 2 ? "The driver is not verified and qualified, unable to provide service." : "Le chauffeur n’est pas vérifié et qualifié, incapable de fournir le services.");
}
if(driver.getState() == 1){
- return ResultUtil.error(language == 1 ? "司机还未上线，无法提供服务" : language == 2 ? "The driver is not online and cannot provide service" : "Le chauffeur n’est pas en ligne et n’est pas en mesure d’offrir ses services");
+ return ResultUtil.error(language == 1 ? "司机还未上线，无法提供服务" : language == 2 ? "The driver is not online, unable to provide service." : "Le chauffeur n’est pas en ligne, incapable de fournir le services.");
}
if(driver.getState() == 3){
- return ResultUtil.error(language == 1 ? "司机正在服务中，无法提供服务" : language == 2 ? "The driver is in service and cannot provide service" : "Le chauffeur est en service et le service n’est pas disponible");
+ return ResultUtil.error(language == 1 ? "司机正在服务中，无法提供服务" : language == 2 ? "The driver is on a trip, unable to provide service." : "Le chauffeur est en service, incapable de fournir des services.");
}
List<DriverService> query = driverServiceService.query(driverId, 1);
if(query.size() == 0){
- return ResultUtil.error(language == 1 ? "该司机不能服务此业务" : language == 2 ? "The driver cannot serve this service" : "Ce conducteur ne peut pas servir cette entreprise");
+ return ResultUtil.error(language == 1 ? "该司机不能服务此业务" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
}
int count = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driverId).eq("driverPay", 1).in("state", Arrays.asList(7, 8, 9)).eq("isDelete", 1));
if(count > 0){
- return ResultUtil.error("司机未支付订单费用，无法进行接单");
+ return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
}
int count1 = orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("driverId", driverId).eq("driverPay", 1).ne("state", 10).eq("isDelete", 1));
if(count1 > 0){
- return ResultUtil.error("司机未支付订单费用，无法进行接单");
+ return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
}
orderPrivateCar.setDriverId(driverId);
@@ -468,10 +468,10 @@
language = userInfoService.queryLanguage(uid, language);
OrderPrivateCar orderPrivateCar = this.selectById(id);
if(null == orderPrivateCar){
- return ResultUtil.error(language == 1 ? "推送订单失败，订单信息有误" : language == 2 ? "Failed to push the order, the order information is wrong" : "Impossible de pousser la commande, les informations de commande sont erronées");
+ return ResultUtil.error(language == 1 ? "推送订单失败，订单信息有误" : language == 2 ? "Failed to deliver order, order-information error." : "Echec de l’envoi de la commande, erreur d’information de commande.");
}
if(orderPrivateCar.getState() != 1){
- return ResultUtil.error(language == 1 ? "订单已被司机接单，不能重复推送" : language == 2 ? "The order has been taken by the driver and cannot be pushed repeatedly" : "La commande a été prise par le chauffeur et ne peut pas être poussée à plusieurs reprises");
+ return ResultUtil.error(language == 1 ? "订单已被司机接单，不能重复推送" : language == 2 ? "Driver has received the order, do not redeliver it." : "Le chauffeur a déjà reçu la commande，Il ne peut pas être répété");
}
//处理摆渡订单的继续推单操作
if(orderPrivateCar.getType() == 2){
@@ -480,7 +480,7 @@
List<Map<String, Integer>> orders = new ArrayList<>();
for(OrderPrivateCar orderPrivateCar1 : list){
if(orderPrivateCar1.getState() != 1){
- return ResultUtil.error(language == 1 ? "订单已被司机接单，推单取消" : language == 2 ? "The order has been taken by the driver, and the push order has been cancelled" : "La commande a été prise par le chauffeur et la commande push a été annulée");
+ return ResultUtil.error(language == 1 ? "订单已被司机接单，推单取消" : language == 2 ? "Driver has received the order, order-delivering cancelled." : "Le chauffeur a déjà reçu la commande. Envoyez-la commande l'annuler.");
}
Map<String, Integer> map = new HashMap<>();
map.put("orderType", 1);
@@ -490,7 +490,7 @@
List<OrderTaxi> list1 = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId()).eq("place", orderPrivateCar.getPlace()));
for(OrderTaxi orderTaxi : list1){
if(orderTaxi.getState() != 1){
- return ResultUtil.error(language == 1 ? "订单已被司机接单，推单取消" : language == 2 ? "The order has been taken by the driver, and the push order has been cancelled" : "La commande a été prise par le chauffeur et la commande push a été annulée");
+ return ResultUtil.error(language == 1 ? "订单已被司机接单，推单取消" : language == 2 ? "Driver has received the order, order-delivering cancelled." : "Le chauffeur a déjà reçu la commande. Envoyez-la commande l'annuler.");
}
Map<String, Integer> map = new HashMap<>();
map.put("orderType", 2);
@@ -507,10 +507,10 @@
}
@Override
- public ResultUtil<BaseWarpper> queryCancleAmount(Integer id) throws Exception {
+ public ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(id);
if(null == orderPrivateCar){
- return ResultUtil.error("获取数据失败，订单信息有误");
+ return ResultUtil.error(language == 1 ? "获取数据失败，订单信息有误" : language == 2 ? "Failed to obtain data, order-information error." : "Impossible d’obtenir les données, erreur d’information de commande. ");
}
double amount = 0;
CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
@@ -540,10 +540,10 @@
OrderPrivateCar orderPrivateCar = this.selectById(id);
Integer integer = null;
if(null == orderPrivateCar){
- return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel the order, the order information is incorrect" : "Échec de l'annulation de la commande, les informations de la commande sont incorrectes");
+ return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel order, order-information error." : "Échec de l’annulation de la commande, erreur d’information de commande.");
}
if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
- return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Cancel order failed, illegal operation" : "Échec de l'annulation de la commande, opération illégale");
+ return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");
}
if(null == orderPrivateCar.getDriverId()){//没有接单的情况
if(orderPrivateCar.getType() == 2){//摆渡车
@@ -593,7 +593,7 @@
driver.setState(2);
driverService.updateById(driver);
}else{
- return ResultUtil.error(language == 1 ? "请完善后台取消规则设置" : language == 2 ? "Please improve the background cancellation rule settings" : "Veuillez améliorer les paramètres de la règle d'annulation en arrière-plan");
+ return ResultUtil.error(language == 1 ? "请完善后台取消规则设置" : language == 2 ? "Please complete the setting of cancellation rules from the background." : "Veuillez compléter le réglage des règles d’annulation à partir de l’arrière-plan.");
}
}
@@ -620,10 +620,10 @@
ResultUtil resultUtil = ResultUtil.success("");
if(null == orderPrivateCar){
- return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Order cancellation failed because the order information is incorrect" : "Annulation échouée, informations de commande incorrectes", "");
+ return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel order, order-information error." : "Échec de l’annulation de la commande, erreur d’information de commande.", "");
}
if(orderPrivateCar.getState() != 12){
- return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Order cancellation failed, illegal operation" : "Annulation de la commande échouée, opération illégale", "");
+ return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.", "");
}
OrderCancel orderCancel = null;
if(null == cancleId || cancleId==0){
@@ -685,7 +685,7 @@
}
if(payType == 3){//余额支付
if(userInfo.getBalance() != null && userInfo.getBalance() < query.getMoney()){
- return ResultUtil.error((language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant"), "");
+ return ResultUtil.error((language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant"), "");
}
userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(query.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -834,10 +834,10 @@
}
@Override
- public List<Map<String, Object>> queryCoupon(Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String, Object>> queryCoupon(Integer language, Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- List<Map<String, Object>> list = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney(), pageNum, size);
- List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney(), pageNum, size);
+ List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney(), pageNum, size);
+ List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney(), pageNum, size);
list.addAll(list1);
return list;
}
@@ -849,10 +849,10 @@
public ResultUtil payPrivateCarOrder(Integer payType, Integer bankCardId, Integer orderId, Integer couponId, Integer type, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
- return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, no double payment is allowed" : "La commande a été payée, aucun paiement en double n’est autorisé", "");
+ return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.", "");
}
if(orderPrivateCar.getState() != 7){
- return ResultUtil.error(language == 1 ? "订单不在待支付状态，不允许支付" : language == 2 ? "The order is not pending payment and cannot be paid" : "La commande n’est pas en attente de paiement et ne permet pas le paiement", "");
+ return ResultUtil.error(language == 1 ? "订单不在待支付状态，不允许支付" : language == 2 ? "The order is no longer with Pending Payment, making payments is not allowed." : "La commande n’est plus en attente de paiement, il n’est pas permis d’effectuer des paiements.", "");
}
Integer uid = orderPrivateCar.getUserId();
Double orderMoney = orderPrivateCar.getOrderMoney();
@@ -866,19 +866,19 @@
if(null != couponId){
userCouponRecord = userCouponRecordService.selectById(couponId);
if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
- return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupons cannot be used for this order" : "Le coupon ne peut pas être utilisé pour cette commande", "");
+ return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
}
if(userCouponRecord.getState() == 2){
- return ResultUtil.error(language == 1 ? "优惠券已使用" : language == 2 ? "Coupon used" : "Coupon a été utilisé", "");
+ return ResultUtil.error(language == 1 ? "优惠券已使用" : language == 2 ? "Coupon has been used." : "Le coupon a été utilisé.", "");
}
if(userCouponRecord.getState() == 3){
- return ResultUtil.error(language == 1 ? "优惠券已过期" : language == 2 ? "Coupon has expired" : "Le coupon a expiré", "");
+ return ResultUtil.error(language == 1 ? "优惠券已过期" : language == 2 ? "Coupon is expired." : "Le coupon a expiré.", "");
}
if(userCouponRecord.getCouponUseType() != 0 && userCouponRecord.getCouponUseType() != 1){
- return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupons cannot be used for this order" : "Le coupon ne peut pas être utilisé pour cette commande", "");
+ return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
}
if(userCouponRecord.getCouponType() == 2 && orderMoney.compareTo(userCouponRecord.getFullMoney()) < 0){
- return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupons cannot be used for this order" : "Le coupon ne peut pas être utilisé pour cette commande", "");
+ return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
}
orderMoney = orderMoney - userCouponRecord.getMoney();
orderPrivateCar.setCouponMoney(userCouponRecord.getMoney());
@@ -962,7 +962,7 @@
}
if(payType == 3){//余额支付
if(userInfo.getBalance() == null || userInfo.getBalance() < orderMoney){
- return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant", "");
+ return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant", "");
}
userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -1022,7 +1022,7 @@
String path = templatePath + "user/receipt.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
Car car = carMapper.selectById(orderPrivateCar.getCarId());
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
@@ -1035,7 +1035,7 @@
document.getElementById("english").remove();
document.getElementById("french").remove();
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
Element xj_chinese = document.getElementById("xj_chinese");
@@ -1051,7 +1051,7 @@
Element track_chinese = document.getElementById("track_chinese");
track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
for (int i = 0; i < driver_chinese.size(); i++) {
Element element = driver_chinese.get(i);
@@ -1079,7 +1079,7 @@
document.getElementById("chinese").remove();
document.getElementById("french").remove();
Element title_english = document.getElementById("title_english");
- title_english.text(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+ title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
Element xj_english = document.getElementById("xj_english");
@@ -1095,7 +1095,7 @@
Element track_english = document.getElementById("track_english");
track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_english = document.getElementsByClass("driver_english");
for (int i = 0; i < driver_english.size(); i++) {
Element element = driver_english.get(i);
@@ -1123,7 +1123,7 @@
document.getElementById("chinese").remove();
document.getElementById("english").remove();
Element title_french = document.getElementById("title_french");
- title_french.text("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
+ title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
Element xj_french = document.getElementById("xj_french");
@@ -1139,18 +1139,18 @@
Element track_french = document.getElementById("track_french");
track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_french = document.getElementsByClass("driver_french");
for (int i = 0; i < driver_french.size(); i++) {
Element element = driver_french.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
Element cp_french = document.getElementById("cp_french");
- cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
+ cp_french.text("Plaque: GS " + car.getCarLicensePlate());
Element pf_french = document.getElementById("pf_french");
- pf_french.text("Évaluation des pilotes: " + aDouble);
+ pf_french.text("Note du chauffeur: " + aDouble);
Element lc_french = document.getElementById("lc_french");
- lc_french.text("Kilométrage: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+ lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
Element start_time_french = document.getElementById("start_time_french");
start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_french = document.getElementById("start_address_french");
@@ -1331,7 +1331,7 @@
String path = templatePath + "user/receipt.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
Car car = carMapper.selectById(orderPrivateCar.getCarId());
Double aDouble = 0D;
@@ -1344,7 +1344,7 @@
document.getElementById("english").remove();
document.getElementById("french").remove();
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
Element xj_chinese = document.getElementById("xj_chinese");
@@ -1360,7 +1360,7 @@
Element track_chinese = document.getElementById("track_chinese");
track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
for (int i = 0; i < driver_chinese.size(); i++) {
Element element = driver_chinese.get(i);
@@ -1388,7 +1388,7 @@
document.getElementById("chinese").remove();
document.getElementById("french").remove();
Element title_english = document.getElementById("title_english");
- title_english.text(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+ title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
Element xj_english = document.getElementById("xj_english");
@@ -1404,7 +1404,7 @@
Element track_english = document.getElementById("track_english");
track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_english = document.getElementsByClass("driver_english");
for (int i = 0; i < driver_english.size(); i++) {
Element element = driver_english.get(i);
@@ -1432,7 +1432,7 @@
document.getElementById("chinese").remove();
document.getElementById("english").remove();
Element title_french = document.getElementById("title_french");
- title_french.text("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
+ title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
Element xj_french = document.getElementById("xj_french");
@@ -1448,18 +1448,18 @@
Element track_french = document.getElementById("track_french");
track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_french = document.getElementsByClass("driver_french");
for (int i = 0; i < driver_french.size(); i++) {
Element element = driver_french.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
Element cp_french = document.getElementById("cp_french");
- cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
+ cp_french.text("Plaque: GS " + car.getCarLicensePlate());
Element pf_french = document.getElementById("pf_french");
- pf_french.text("Évaluation des pilotes: " + aDouble);
+ pf_french.text("Note du chauffeur: " + aDouble);
Element lc_french = document.getElementById("lc_french");
- lc_french.text("Kilométrage: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+ lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
Element start_time_french = document.getElementById("start_time_french");
start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_french = document.getElementById("start_address_french");
@@ -1605,11 +1605,11 @@
Map<String, Object> map = userActivityRedenvelopeService.query(orderPrivateCar.getCompanyId(), orderPrivateCar.getTravelTime());
Double laveMoney = Double.valueOf(String.valueOf(map.get("laveMoney")));
if(money.compareTo(laveMoney) > 0){
- return ResultUtil.error("手速太慢了，红包已派发完啦！");
+ return ResultUtil.error(language == 1 ? "手速太慢了，红包已派发完啦！" : language == 2 ? "Too slow, all the lucky-promo has been distributed!" : "Trop lent, toute la promo chanceuse a été distribuée !");
}
//判断当前红包是否大于剩余可领取总金额
if(money.compareTo(Double.valueOf(map.get("lavePrice").toString())) > 0){
- return ResultUtil.error("手速太慢了，红包已派发完啦！");
+ return ResultUtil.error(language == 1 ? "手速太慢了，红包已派发完啦！" : language == 2 ? "Too slow, all the lucky-promo has been distributed!" : "Trop lent, toute la promo chanceuse a été distribuée !");
}
double v = new BigDecimal(laveMoney).subtract(new BigDecimal(money)).doubleValue();
@@ -1633,7 +1633,7 @@
Element user_chinese = document.getElementById("user_chinese");
user_chinese.text("您好 " + userInfo.getNickName() + "，");
Element time_chinese = document.getElementById("time_chinese");
- time_chinese.text("此活动有效期在" + sdf.format(query.getInsertTime()) + "至" + sdf.format(query.getEndTime()) + "，详情请查看I-GO平台");
+ time_chinese.text("此活动有效期在" + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + "至" + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + "，详情请查看I-GO平台");
}
if(2 == language){
document.getElementById("chinese").remove();
@@ -1641,7 +1641,7 @@
Element user_english = document.getElementById("user_english");
user_english.text("Hello " + userInfo.getNickName() + "，");
Element time_english = document.getElementById("time_english");
- time_english.text("You could use it from" + sdf.format(query.getInsertTime()) + "to" + sdf.format(query.getEndTime()) + "，check more details on the app.");
+ time_english.text("You could use it from" + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + "to" + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + "，check more details on the app.");
}
if(3 == language){
document.getElementById("chinese").remove();
@@ -1649,7 +1649,7 @@
Element user_french = document.getElementById("user_french");
user_french.text("Bonjour " + userInfo.getNickName() + "，");
Element time_french = document.getElementById("time_french");
- time_french.text("Cette promotion est valable du" + sdf.format(query.getInsertTime()) + "au" + sdf.format(query.getEndTime()) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
+ time_french.text("Cette promotion est valable du" + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + "au" + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Red envelope activity" : "Activité de l’enveloppe rouge", document.html());
@@ -1835,7 +1835,7 @@
String path = templatePath + "user/receipt.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
Car car = carMapper.selectById(orderPrivateCar.getCarId());
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
@@ -1848,7 +1848,7 @@
document.getElementById("english").remove();
document.getElementById("french").remove();
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
Element xj_chinese = document.getElementById("xj_chinese");
@@ -1864,7 +1864,7 @@
Element track_chinese = document.getElementById("track_chinese");
track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + id);
Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
for (int i = 0; i < driver_chinese.size(); i++) {
Element element = driver_chinese.get(i);
@@ -1892,7 +1892,7 @@
document.getElementById("chinese").remove();
document.getElementById("french").remove();
Element title_english = document.getElementById("title_english");
- title_english.text(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+ title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
Element xj_english = document.getElementById("xj_english");
@@ -1908,7 +1908,7 @@
Element track_english = document.getElementById("track_english");
track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + id);
Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_english = document.getElementsByClass("driver_english");
for (int i = 0; i < driver_english.size(); i++) {
Element element = driver_english.get(i);
@@ -1936,7 +1936,7 @@
document.getElementById("chinese").remove();
document.getElementById("english").remove();
Element title_french = document.getElementById("title_french");
- title_french.text("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
+ title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
Element xj_french = document.getElementById("xj_french");
@@ -1952,18 +1952,18 @@
Element track_french = document.getElementById("track_french");
track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + id);
Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_french = document.getElementsByClass("driver_french");
for (int i = 0; i < driver_french.size(); i++) {
Element element = driver_french.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
Element cp_french = document.getElementById("cp_french");
- cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
+ cp_french.text("Plaque: GS " + car.getCarLicensePlate());
Element pf_french = document.getElementById("pf_french");
- pf_french.text("Évaluation des pilotes: " + aDouble);
+ pf_french.text("Note du chauffeur: " + aDouble);
Element lc_french = document.getElementById("lc_french");
- lc_french.text("Kilométrage: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+ lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
Element start_time_french = document.getElementById("start_time_french");
start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_french = document.getElementById("start_address_french");
@@ -2054,10 +2054,14 @@
}
@Override
- public List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String, Object>> queryMyOrderList(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> maps = orderPrivateCarMapper.queryMyOrderList(uid, pageNum, size);
for(Map<String, Object> map : maps){
+ String orderTime = map.get("orderTime").toString();
+ map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat1(language, time));
Integer orderId = Integer.valueOf(String.valueOf(map.get("orderId")));
Integer state = Integer.valueOf(String.valueOf(map.get("state")));
if(state == 11){
@@ -2073,15 +2077,22 @@
}
@Override
- public List<Map<String, Object>> queryInvoiceOrder(Integer type, Date startTime, Date endTime, Double startMoney, Double endMoney, Integer uid) throws Exception {
+ public List<Map<String, Object>> queryInvoiceOrder(Integer language, Integer type, Date startTime, Date endTime, Double startMoney, Double endMoney, Integer uid) throws Exception {
startTime = dateUtil.getStartOrEndDate(startTime, "start");
endTime = dateUtil.getStartOrEndDate(endTime, "end");
- return orderPrivateCarMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
+ List<Map<String, Object>> list = orderPrivateCarMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
@Override
- public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
+ public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
Integer state = Integer.valueOf(String.valueOf(map.get("state")));
if(null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2){//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
@@ -2125,8 +2136,13 @@
}
@Override
- public List<Map<String, Object>> queryMyTravelRecord(Integer uid) throws Exception {
- return orderPrivateCarMapper.queryMyTravelRecord(uid);
+ public List<Map<String, Object>> queryMyTravelRecord(Integer language, Integer uid) throws Exception {
+ List<Map<String, Object>> list = orderPrivateCarMapper.queryMyTravelRecord(uid);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
@@ -2239,8 +2255,13 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryRedEnvelope(Integer uid) throws Exception {
- return orderPrivateCarMapper.queryRedEnvelope(uid);
+ public List<Map<String, Object>> queryRedEnvelope(Integer language, Integer uid) throws Exception {
+ List<Map<String, Object>> list = orderPrivateCarMapper.queryRedEnvelope(uid);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
/**
--
Gitblit v1.7.1