From 1041ea227d67af5cb3067c5466f6868831fe0eea Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 01 二月 2024 08:49:28 +0800
Subject: [PATCH] BUG修改
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 493 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 352 insertions(+), 141 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 3089f3c..6fe0cac 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
@@ -191,6 +191,12 @@
@Autowired
private ISettlementAllocationService settlementAllocationService;
+ @Autowired
+ private TEmailService emailService;
+
+ @Autowired
+ private IPhoneService phoneService;
+
/**
@@ -225,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);
@@ -248,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;", "(");
@@ -256,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();
@@ -281,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());
@@ -294,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);
@@ -441,8 +447,8 @@
//添加消息
systemNoticeService.addSystemNotice(1, language == 1 ? "您的打车订单已下单成功，我们正在为您指派司机，请稍后！" :
- language == 2 ? "Your ride order has been successfully placed, we are assigning a driver for you, please wait!" :
- "Votre commande a bien été passée, nous vous assignons un chauffeur, veuillez patienter!", orderPrivateCar.getUserId(), 1);
+ language == 2 ? "You've placed the ride order successfully, we are assigning you a driver, please wait." :
+ "Vous avez passé la commande de course avec succès, nous vous attribuons un chauffeur, veuillez patienter.", orderPrivateCar.getUserId(), 1);
BaseWarpper baseWarpper = new BaseWarpper();
baseWarpper.setState(orderPrivateCar.getState());
@@ -462,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){
@@ -474,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);
@@ -484,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);
@@ -501,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());
@@ -534,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){//摆渡车
@@ -587,13 +593,13 @@
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.");
}
}
//添加消息
- systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消出行订单，谢谢使用！" : language == 2 ? "You have successfully canceled the travel order, thank you for using" : "Vous avez annulé avec succès la commande de voyage, merci d'utiliser", orderPrivateCar.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消出行订单，谢谢使用！" : language == 2 ? "You've cancelled the ride order successfully, thank you for using I-GO " : "Vous avez annulé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
Map<String, Object> map = new HashMap<>();
map.put("id", integer);
return ResultUtil.success(map);
@@ -614,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){
@@ -679,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());
@@ -718,8 +724,8 @@
//添加消息
systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
- ? "You have successfully paid the cancellation fee, thank you for using!"
- : "Vous avez payé avec succès les frais d’annulation de commande, merci d’utiliser!", orderPrivateCar.getUserId(), 1);
+ ? "You've paid for cancellation fee with the balance successfully, thank you for using I-GO"
+ : "Vous avez utilisé avec succès votre solde pour payer les frais d’annulation, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
}
}
return resultUtil;
@@ -748,6 +754,7 @@
PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
//获取空闲司机
List<Driver> list = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
+ System.err.println("【" + orderPrivateCar.getId() + "】空闲司机：" + JSON.toJSONString(list));
if(list.size() > 0){
double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
@@ -820,17 +827,39 @@
UserInfo userInfo = userInfoService.selectById(uid);
map.put("balance", userInfo.getBalance());
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney());
- i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney());
+ UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
+ double v = orderPrivateCar.getOrderMoney();
+ if(null != query2){
+ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+ if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
+ Double special = query2.getSpecial();
+ orderPrivateCar.setDiscount(special);
+ Double orderMoney = orderPrivateCar.getOrderMoney();
+ v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ }
+ }
+ int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, v);
+ i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, v);
map.put("coupon", i);
return map;
}
@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);
+ UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
+ double v = orderPrivateCar.getOrderMoney();
+ if(null != query2){
+ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+ if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
+ Double special = query2.getSpecial();
+ orderPrivateCar.setDiscount(special);
+ Double orderMoney = orderPrivateCar.getOrderMoney();
+ v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ }
+ }
+ List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 1, v, pageNum, size);
+ List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 0, v, pageNum, size);
list.addAll(list1);
return list;
}
@@ -842,10 +871,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();
@@ -854,39 +883,7 @@
orderPrivateCar.setCouponMoney(0D);//初始化历史数据
orderPrivateCar.setCouponId(null);
- //计算优惠券
- UserCouponRecord userCouponRecord = null;
- 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", "");
- }
- if(userCouponRecord.getState() == 2){
- return ResultUtil.error(language == 1 ? "优惠券已使用" : language == 2 ? "Coupon used" : "Coupon a été utilisé", "");
- }
- if(userCouponRecord.getState() == 3){
- return ResultUtil.error(language == 1 ? "优惠券已过期" : language == 2 ? "Coupon has 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", "");
- }
- 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", "");
- }
- orderMoney = orderMoney - userCouponRecord.getMoney();
- orderPrivateCar.setCouponMoney(userCouponRecord.getMoney());
- orderPrivateCar.setCouponId(couponId);
- }
- orderMoney=new BigDecimal(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
-
- //计算红包
- UserRedPacketRecord query = userRedPacketRecordService.query(uid, orderPrivateCar.getCompanyId(), 1, 1, orderMoney);
- if(null != query && query.getMoney().compareTo(orderMoney) < 0){
- orderMoney = orderMoney - query.getMoney();
- orderPrivateCar.setRedPacketMoney(query.getMoney());
- orderPrivateCar.setRedPacketId(query.getId());
- }
- //计算折扣
+ //计算折扣
UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
if(null != query2){
Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
@@ -900,7 +897,39 @@
orderMoney = v;
}
}
+ }
+ //计算优惠券
+ UserCouponRecord userCouponRecord = null;
+ if(null != couponId){
+ userCouponRecord = userCouponRecordService.selectById(couponId);
+ if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
+ 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 has been used." : "Le coupon a été utilisé.", "");
+ }
+ if(userCouponRecord.getState() == 3){
+ 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 ? "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 ? "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());
+ orderPrivateCar.setCouponId(couponId);
+ }
+ orderMoney=new BigDecimal(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+
+ //计算红包
+ UserRedPacketRecord query = userRedPacketRecordService.query(uid, orderPrivateCar.getCompanyId(), 1, 1, orderMoney);
+ if(null != query && query.getMoney().compareTo(orderMoney) < 0){
+ orderMoney = orderMoney - query.getMoney();
+ orderPrivateCar.setRedPacketMoney(query.getMoney());
+ orderPrivateCar.setRedPacketId(query.getId());
}
if(payType == 1){//手机支付
@@ -955,7 +984,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());
@@ -1015,7 +1044,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());
@@ -1027,14 +1056,15 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("I-GO电子收据");
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");
xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_chinese = document.getElementById("pay_type_chinese");
- pay_type_chinese.text("余额");
+ pay_type_chinese.text("余额支付");
Element pay_money_chinese = document.getElementById("pay_money_chinese");
pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_chinese = document.getElementById("pdf_chinese");
@@ -1044,7 +1074,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);
@@ -1064,18 +1094,22 @@
end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_chinese = document.getElementById("end_address_chinese");
end_address_chinese.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_chinese = document.getElementById("server_tel_chinese");
+ server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Receipt");
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");
xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text("balance");
+ pay_type_english.text("I-GO Wallet");
Element pay_money_english = document.getElementById("pay_money_english");
pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_english = document.getElementById("pdf_english");
@@ -1085,7 +1119,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);
@@ -1105,18 +1139,22 @@
end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_english = document.getElementById("end_address_english");
end_address_english.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_english = document.getElementById("server_tel_english");
+ server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Reçu");
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");
xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("Le solde");
+ pay_type_french.text("Portefeuille I-GO");
Element pay_money_french = document.getElementById("pay_money_french");
pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_french = document.getElementById("pdf_french");
@@ -1126,18 +1164,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");
@@ -1146,8 +1184,11 @@
end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_french = document.getElementById("end_address_french");
end_address_french.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_french = document.getElementById("server_tel_french");
+ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -1171,8 +1212,34 @@
if(!file1.exists()){
file1.createNewFile();
}
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ try {
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ }catch (Exception e){
+ e.printStackTrace();
+ System.out.println("html转pdf异常");
+ }
+
+ String link ="http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
+ tEmail.setType(1);
+ tEmail.setOrderId(orderId);
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ tEmail.setWeek(EmailUtil.getWeek(language,i));
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
+
+
+
}catch (Exception e){
e.printStackTrace();
}
@@ -1192,8 +1259,8 @@
}).start();
systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
- ? "You have successfully completed the travel order payment, thank you for using!"
- : "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1);
+ ? "You've paid for the ride order successfully, thank you for using I-GO"
+ : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
}
@@ -1293,7 +1360,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;
@@ -1305,8 +1372,9 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("I-GO电子收据");
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");
@@ -1322,7 +1390,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);
@@ -1342,12 +1410,16 @@
end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_chinese = document.getElementById("end_address_chinese");
end_address_chinese.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_chinese = document.getElementById("server_tel_chinese");
+ server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Receipt");
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");
@@ -1363,7 +1435,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);
@@ -1383,18 +1455,22 @@
end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_english = document.getElementById("end_address_english");
end_address_english.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_english = document.getElementById("server_tel_english");
+ server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Reçu");
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");
xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("espèces");
+ pay_type_french.text("En espèces");
Element pay_money_french = document.getElementById("pay_money_french");
pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_french = document.getElementById("pdf_french");
@@ -1404,18 +1480,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");
@@ -1424,9 +1500,12 @@
end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_french = document.getElementById("end_address_french");
end_address_french.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_french = document.getElementById("server_tel_french");
+ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -1450,8 +1529,32 @@
if(!file1.exists()){
file1.createNewFile();
}
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ try {
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ }catch (Exception e){
+ e.printStackTrace();
+ System.out.println("html转pdf异常");
+ }
+ String link ="http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
+ tEmail.setType(1);
+ tEmail.setOrderId(orderId);
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ tEmail.setWeek(EmailUtil.getWeek(language,i));
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
+
+
}catch (Exception e){
e.printStackTrace();
}
@@ -1472,13 +1575,14 @@
}).start();
systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
- ? "You have successfully completed the travel order payment, thank you for using!"
- : "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1);
+ ? "You've paid for the ride order successfully, thank you for using I-GO"
+ : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
}
this.updateAllColumnById(orderPrivateCar);
return resultUtil;
}
+
@Override
public synchronized ResultUtil<BaseWarpper> queryRedMoney(Integer orderId) throws Exception {
@@ -1538,11 +1642,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();
@@ -1563,29 +1667,64 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("红包活动");
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.getExpirationTime())) + "，详情请查看I-GO平台");
}
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Lucky-promo activities");
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.getExpirationTime())) + "，check more details on the app.");
}
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Activités bonus");
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.getExpirationTime())) + ". 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());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus", document.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/redpacket_" + orderId + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(userInfo.getId());
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus");
+ tEmail.setOrderId(orderId);
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ tEmail.setWeek(EmailUtil.getWeek(language,i));
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
+
}
}
@@ -1649,8 +1788,8 @@
//添加消息
systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
- ? "You have successfully paid the cancellation fee, thank you for using!"
- : "Vous avez payé avec succès les frais d’annulation de commande, merci d’utiliser!", orderPrivateCar.getUserId(), 1);
+ ? "You've paid for cancellation fee with the balance successfully, thank you for using I-GO"
+ : "Vous avez utilisé avec succès votre solde pour payer les frais d’annulation, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
}else{
System.err.println("预支付数据异常（orderId = " + id + ")");
}
@@ -1725,7 +1864,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());
@@ -1737,14 +1876,15 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("I-GO电子收据");
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");
xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_chinese = document.getElementById("pay_type_chinese");
- pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机" : "银行卡");
+ pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机支付" : (orderPrivateCar.getPayType() == 2?"银行卡支付":(orderPrivateCar.getPayType() == 3?"余额支付":"现金支付")));
Element pay_money_chinese = document.getElementById("pay_money_chinese");
pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_chinese = document.getElementById("pdf_chinese");
@@ -1754,7 +1894,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);
@@ -1774,18 +1914,22 @@
end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_chinese = document.getElementById("end_address_chinese");
end_address_chinese.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_chinese = document.getElementById("server_tel_chinese");
+ server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Receipt");
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");
xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Bank card");
+ pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile money" :(orderPrivateCar.getPayType() == 2?"Bank card":(orderPrivateCar.getPayType() == 3?"I-GO Wallet":"Cash")));
Element pay_money_english = document.getElementById("pay_money_english");
pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_english = document.getElementById("pdf_english");
@@ -1795,7 +1939,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);
@@ -1815,18 +1959,22 @@
end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_english = document.getElementById("end_address_english");
end_address_english.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_english = document.getElementById("server_tel_english");
+ server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Reçu");
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");
xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Carte bancaire");
+ pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Argent mobile" : (orderPrivateCar.getPayType() == 2?"Carte bancaire":(orderPrivateCar.getPayType() == 3?"Portefeuille I-GO":"En espèces")));
Element pay_money_french = document.getElementById("pay_money_french");
pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_french = document.getElementById("pdf_french");
@@ -1836,18 +1984,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");
@@ -1856,9 +2004,12 @@
end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_french = document.getElementById("end_address_french");
end_address_french.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_french = document.getElementById("server_tel_french");
+ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -1882,8 +2033,33 @@
if(!file1.exists()){
file1.createNewFile();
}
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ try {
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ }catch (Exception e){
+ e.printStackTrace();
+ System.out.println("html转pdf异常");
+ }
+
+
+ String link ="http://182.160.16.251:81/files/html/ride_receipt_" + id + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
+ tEmail.setUserId(userInfo.getId());
+ tEmail.setType(1);
+ tEmail.setOrderId(id);
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ tEmail.setWeek(EmailUtil.getWeek(language,i));
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
+
}catch (Exception e){
e.printStackTrace();
}
@@ -1902,8 +2078,8 @@
}).start();
systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
- ? "You have successfully completed the travel order payment, thank you for using!"
- : "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1);
+ ? "You've paid for the ride order successfully, thank you for using I-GO"
+ : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
}else{
System.err.println("预支付数据异常（orderId = " + id + ")");
}
@@ -1915,10 +2091,18 @@
}
@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){
+ if(null != map.get("orderTime")){
+ String orderTime = map.get("orderTime").toString();
+ map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
+ }
+ if(null != map.get("time")){
+ 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){
@@ -1934,15 +2118,27 @@
}
@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) {
+ map.put("orderName", language == 1 ? "打车订单" : language == 2 ? "Ride" : "Course");
+ if(null != map.get("time")){
+ 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);
+ if(null != map.get("travelTime")){
+ 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);
@@ -1986,8 +2182,15 @@
}
@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) {
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ }
+ return list;
}
@@ -2100,8 +2303,16 @@
* @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) {
+ map.put("name", language == 1 ? "打车订单" : language == 2 ? "Ride" : "Course");
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ }
+ return list;
}
/**
--
Gitblit v1.7.1