From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 223 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 157 insertions(+), 66 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index e8e6fc0..a81c85d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -8,6 +8,7 @@
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogisticsSpread;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsSpreadService;
+import com.stylefeng.guns.modular.system.dao.CarMapper;
import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.dao.UserInfoMapper;
import com.stylefeng.guns.modular.system.model.*;
@@ -96,6 +97,12 @@
@Autowired
private IPhoneService phoneService;
+ @Resource
+ private CarMapper carMapper;
+
+ @Autowired
+ private IOrderEvaluateService orderEvaluateService;
+
@@ -110,8 +117,10 @@
@Override
public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
Map<String, Object> map = orderLogisticsMapper.queryPushOrder(orderId, language);
- String travelTime = map.get("travelTime").toString();
- map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ if(null != map.get("travelTime")){
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ }
return map;
}
@@ -196,12 +205,11 @@
}).start();
systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得包裹订单，请及时联系客户！" :
- language == 2 ? "You have successfully captured the parcel order, please contact the customer in time!"
- : "Vous avez saisi avec succès la commande de colis, veuillez contacter le client à temps!", orderLogistics.getDriverId());
+ language == 2 ? "You have grabbed the package order, please contact the client timely."
+ : "Vous avez saisi la commande du colis. Veuillez contacter le client en temps opportun.", orderLogistics.getDriverId());
systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
- language == 2 ? "Your order has been assigned to " + driver.getFirstName() + " master, please keep the phone open!"
- : "Votre commande a été attribuée à " + driver.getFirstName() + " master, veuillez garder le téléphone ouvert!", orderLogistics.getUserId());
-
+ language == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
+ : "Votre commande a été attribuée au chauffeur- " + driver.getFirstName() + ", S'il vous plaît, restez en ligne.", orderLogistics.getUserId());
return ResultUtil.success();
}
@@ -215,8 +223,10 @@
@Override
public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderLogisticsMapper.queryOrderInfo(orderId);
- String travelTime_ = map.get("travelTime_").toString();
- map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ if(null != map.get("travelTime_")){
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ }
return map;
}
@@ -234,16 +244,19 @@
@Override
public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
+ if(orderLogistics.getState().compareTo(state) == 0){
+ return ResultUtil.error(language == 1 ? "不能重复操作" : language == 2 ? "Unable to recur operate" : "Impossible de récurrence des opérer");
+ }
switch (state){
case 3://出发前往预约点
orderLogistics.setState(3);
orderLogistics.setSetOutTime(new Date());
- systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "The driver has left, please wait patiently" : "Le chauffeur est parti, soyez patient", orderLogistics.getUserId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "The driver is on the way, please wait." : "Le chauffeur est en route. Veuillez patienter.", orderLogistics.getUserId());
break;
case 4://到达预约点，等待客户上车
orderLogistics.setState(4);
orderLogistics.setArriveTime(new Date());
- systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点。" : language == 2 ? "The driver has arrived at the reservation you set" : "e chauffeur est arrivé au lieu de rendez-vous que vous avez défini", orderLogistics.getUserId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点。" : language == 2 ? "The driver has arrived at the reserved location." : "Le chauffeur est arrivé à l'endroit prévu.", orderLogistics.getUserId());
break;
case 5://开始服务
orderLogistics.setBoardingLon(lon);
@@ -303,6 +316,7 @@
if(state == 6){
UserInfo userInfo = userInfoMapper.selectById(orderLogistics.getUserId());
+ language = userInfo.getLanguage();
if(orderLogistics.getPayType() == 1){
if(ToolUtil.isNotEmpty(userInfo.getEmail())){
String path = templatePath + "user/receiptLogistics.html";
@@ -310,9 +324,15 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ Car car = carMapper.selectById(orderLogistics.getCarId());
+ Double aDouble = 0D;
+ if(null != orderLogistics.getDriverId()){
+ aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId());
+ }
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(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
@@ -320,7 +340,7 @@
Element xj_chinese = document.getElementById("xj_chinese");
xj_chinese.text("GHS " + orderLogistics.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 " + orderLogistics.getPayMoney());
Element pdf_chinese = document.getElementById("pdf_chinese");
@@ -336,6 +356,10 @@
Element element = driver_chinese.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
+ Element cp_chinese = document.getElementById("cp_chinese");
+ cp_chinese.text("车牌：" + car.getCarLicensePlate());
+ Element pf_chinese = document.getElementById("pf_chinese");
+ pf_chinese.text("司机评分：" + aDouble);
Element start_address_chinese = document.getElementById("start_address_chinese");
start_address_chinese.text(orderLogistics.getStartAddress());
Element end_address_chinese = document.getElementById("end_address_chinese");
@@ -347,6 +371,7 @@
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(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
@@ -354,7 +379,7 @@
Element xj_english = document.getElementById("xj_english");
xj_english.text("GHS " + orderLogistics.getOrderMoney());
Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text("Mobile");
+ pay_type_english.text("Mobile money");
Element pay_money_english = document.getElementById("pay_money_english");
pay_money_english.text("GHS " + orderLogistics.getPayMoney());
Element pdf_english = document.getElementById("pdf_english");
@@ -370,6 +395,10 @@
Element element = driver_english.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
+ Element cp_english = document.getElementById("cp_english");
+ cp_english.text("Number Plate：" + car.getCarLicensePlate());
+ Element pf_english = document.getElementById("pf_english");
+ pf_english.text("Driver Rating：" + aDouble);
Element start_address_english = document.getElementById("start_address_english");
start_address_english.text(orderLogistics.getStartAddress());
Element end_address_english = document.getElementById("end_address_english");
@@ -381,6 +410,7 @@
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(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
@@ -388,7 +418,7 @@
Element xj_french = document.getElementById("xj_french");
xj_french.text("GHS " + orderLogistics.getOrderMoney());
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("Mobile");
+ pay_type_french.text("Argent mobile");
Element pay_money_french = document.getElementById("pay_money_french");
pay_money_french.text("GHS " + orderLogistics.getPayMoney());
Element pdf_french = document.getElementById("pdf_french");
@@ -404,6 +434,10 @@
Element element = driver_french.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
+ Element cp_french = document.getElementById("cp_french");
+ cp_french.text("Plaque: GS " + car.getCarLicensePlate());
+ Element pf_french = document.getElementById("pf_french");
+ pf_french.text("Note du chauffeur: " + aDouble);
Element start_address_french = document.getElementById("start_address_french");
start_address_french.text(orderLogistics.getStartAddress());
Element end_address_french = document.getElementById("end_address_french");
@@ -413,7 +447,7 @@
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", 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/");
@@ -437,15 +471,20 @@
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/parcel_receipt_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(userInfo.getId());
tEmail.setType(1);
- tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis");
+ tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
tEmail.setOrderId(orderId);
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
@@ -453,9 +492,9 @@
tEmail.setWeek(week);
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
@@ -468,9 +507,15 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ Car car = carMapper.selectById(orderLogistics.getCarId());
+ Double aDouble = 0D;
+ if(null != orderLogistics.getDriverId()){
+ aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId());
+ }
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(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
@@ -478,7 +523,7 @@
Element xj_chinese = document.getElementById("xj_chinese");
xj_chinese.text("GHS " + orderLogistics.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 " + orderLogistics.getPayMoney());
Element pdf_chinese = document.getElementById("pdf_chinese");
@@ -494,6 +539,10 @@
Element element = driver_chinese.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
+ Element cp_chinese = document.getElementById("cp_chinese");
+ cp_chinese.text("车牌：" + car.getCarLicensePlate());
+ Element pf_chinese = document.getElementById("pf_chinese");
+ pf_chinese.text("司机评分：" + aDouble);
Element start_address_chinese = document.getElementById("start_address_chinese");
start_address_chinese.text(orderLogistics.getStartAddress());
Element end_address_chinese = document.getElementById("end_address_chinese");
@@ -505,6 +554,7 @@
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(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
@@ -528,6 +578,10 @@
Element element = driver_english.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
+ Element cp_english = document.getElementById("cp_english");
+ cp_english.text("Number Plate：" + car.getCarLicensePlate());
+ Element pf_english = document.getElementById("pf_english");
+ pf_english.text("Driver Rating：" + aDouble);
Element start_address_english = document.getElementById("start_address_english");
start_address_english.text(orderLogistics.getStartAddress());
Element end_address_english = document.getElementById("end_address_english");
@@ -539,6 +593,7 @@
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(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
@@ -562,6 +617,10 @@
Element element = driver_french.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
+ Element cp_french = document.getElementById("cp_french");
+ cp_french.text("Plaque: GS " + car.getCarLicensePlate());
+ Element pf_french = document.getElementById("pf_french");
+ pf_french.text("Note du chauffeur: " + aDouble);
Element start_address_french = document.getElementById("start_address_french");
start_address_french.text(orderLogistics.getStartAddress());
Element end_address_french = document.getElementById("end_address_french");
@@ -571,7 +630,7 @@
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", 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/");
@@ -595,15 +654,20 @@
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/parcel_receipt_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(userInfo.getId());
tEmail.setType(1);
- tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis");
+ tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
tEmail.setOrderId(orderId);
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
@@ -611,9 +675,9 @@
tEmail.setWeek(week);
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
@@ -626,9 +690,15 @@
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ Car car = carMapper.selectById(orderLogistics.getCarId());
+ Double aDouble = 0D;
+ if(null != orderLogistics.getDriverId()){
+ aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId());
+ }
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(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
@@ -636,7 +706,7 @@
Element xj_chinese = document.getElementById("xj_chinese");
xj_chinese.text("GHS " + orderLogistics.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 " + orderLogistics.getPayMoney());
Element pdf_chinese = document.getElementById("pdf_chinese");
@@ -652,6 +722,10 @@
Element element = driver_chinese.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
+ Element cp_chinese = document.getElementById("cp_chinese");
+ cp_chinese.text("车牌：" + car.getCarLicensePlate());
+ Element pf_chinese = document.getElementById("pf_chinese");
+ pf_chinese.text("司机评分：" + aDouble);
Element start_address_chinese = document.getElementById("start_address_chinese");
start_address_chinese.text(orderLogistics.getStartAddress());
Element end_address_chinese = document.getElementById("end_address_chinese");
@@ -663,6 +737,7 @@
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(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
@@ -670,7 +745,7 @@
Element xj_english = document.getElementById("xj_english");
xj_english.text("GHS " + orderLogistics.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 " + orderLogistics.getPayMoney());
Element pdf_english = document.getElementById("pdf_english");
@@ -686,6 +761,10 @@
Element element = driver_english.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
+ Element cp_english = document.getElementById("cp_english");
+ cp_english.text("Number Plate：" + car.getCarLicensePlate());
+ Element pf_english = document.getElementById("pf_english");
+ pf_english.text("Driver Rating：" + aDouble);
Element start_address_english = document.getElementById("start_address_english");
start_address_english.text(orderLogistics.getStartAddress());
Element end_address_english = document.getElementById("end_address_english");
@@ -697,6 +776,7 @@
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(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
@@ -704,7 +784,7 @@
Element xj_french = document.getElementById("xj_french");
xj_french.text("GHS " + orderLogistics.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 " + orderLogistics.getPayMoney());
Element pdf_french = document.getElementById("pdf_french");
@@ -720,6 +800,10 @@
Element element = driver_french.get(i);
element.text(driver.getFirstName() + "." + driver.getLastName());
}
+ Element cp_french = document.getElementById("cp_french");
+ cp_french.text("Plaque: GS " + car.getCarLicensePlate());
+ Element pf_french = document.getElementById("pf_french");
+ pf_french.text("Note du chauffeur: " + aDouble);
Element start_address_french = document.getElementById("start_address_french");
start_address_french.text(orderLogistics.getStartAddress());
Element end_address_french = document.getElementById("end_address_french");
@@ -729,7 +813,7 @@
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", 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/");
@@ -753,15 +837,20 @@
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/parcel_receipt_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(userInfo.getId());
tEmail.setType(1);
- tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis");
+ tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
tEmail.setOrderId(orderId);
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
@@ -769,9 +858,9 @@
tEmail.setWeek(week);
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
}
@@ -840,8 +929,10 @@
public List<Map<String, Object>> queryOrderList(Integer driverId, Integer language) throws Exception {
List<Map<String, Object>> list = orderLogisticsMapper.queryOrderList(driverId, language);
for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return list;
}
@@ -857,8 +948,10 @@
public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
List<Map<String, Object>> list = orderLogisticsMapper.queryMyAllOrder(state, uid, language);
for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return list;
}
@@ -934,12 +1027,12 @@
}
}).start();
- systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得出租车订单，请及时联系客户！" :
- language == 2 ? "You have successfully captured the taxi order, please contact the customer in time!"
- : "Vous avez saisi avec succès la commande de taxi, veuillez contacter le client à temps!", orderLogistics.getDriverId());
+ systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得包裹订单，请及时联系客户！" :
+ language == 2 ? "You have grabbed the package order, please contact the client timely."
+ : "Vous avez saisi la commande du colis. Veuillez contacter le client en temps opportun.", orderLogistics.getDriverId());
systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
- language == 2 ? "Your order has been assigned to " + driver.getFirstName() + " master, please keep the phone open!"
- : "Votre commande a été attribuée à " + driver.getFirstName() + " master, veuillez garder le téléphone ouvert!", orderLogistics.getUserId());
+ language == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
+ : "Votre commande a été attribuée au chauffeur- " + driver.getFirstName() + ", S'il vous plaît, restez en ligne.", orderLogistics.getUserId());
return ResultUtil.success();
}
@@ -951,15 +1044,21 @@
@Override
public void sendVerificationCode(Integer orderId, Integer language) throws Exception {
+ String value = redisUtil.getValue("PickUpCode_" + orderId);
+ if(ToolUtil.isNotEmpty(value)){
+ return;
+ }
OrderLogistics orderLogistics = this.selectById(orderId);
String random = "";
for(int i = 0; i < 6; i++){
random += Double.valueOf(Math.random() * 10).intValue();
}
+ redisUtil.setStrValue("PickUpCode_" + orderId, random, 600);
orderLogistics.setPickUpCode(random);
this.updateById(orderLogistics);
UserInfo userInfo = userInfoMapper.selectById(orderLogistics.getUserId());
+ language = userInfo.getLanguage();
if(ToolUtil.isNotEmpty(userInfo.getEmail())){
String path = templatePath + "driver/index.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
@@ -976,10 +1075,11 @@
document.getElementById("driverAudit").remove();
document.getElementById("carAudit").remove();
+ document.getElementsByTag("title").get(0).text("取件码邮件");
Element email_user = document.getElementById("email_user");
- email_user.text("您好 ，");
+ email_user.text("您好 " + userInfo.getFirstName() + " " + userInfo.getLastName());
Element email_content = document.getElementById("email_content");
- email_content.text("邮件取件码是：" + random + "，请在5分钟内完成验证");
+ email_content.text("包裹取件码是:" + random + "，请在 5 分钟内完成验证。");
}
if(2 == language){
document.getElementById("chinese").remove();
@@ -994,10 +1094,11 @@
document.getElementById("driverAudit1").remove();
document.getElementById("carAudit1").remove();
+ document.getElementsByTag("title").get(0).text("Pickup code");
Element email1_user = document.getElementById("email1_user");
- email1_user.text("Hello ，");
+ email1_user.text("Hello " + userInfo.getFirstName() + " " + userInfo.getLastName());
Element email1_content = document.getElementById("email1_content");
- email1_content.text("pickup code is " + random + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");
+ email1_content.text("Your package pickup code is " + random + ", please complete the verification within 5 minutes.");
}
if(3 == language){
document.getElementById("chinese").remove();
@@ -1012,12 +1113,13 @@
document.getElementById("driverAudit2").remove();
document.getElementById("carAudit2").remove();
+ document.getElementsByTag("title").get(0).text("Code de ramassage");
Element email2_user = document.getElementById("email2_user");
- email2_user.text("Bonjour ，");
+ email2_user.text("Bonjour " + userInfo.getFirstName() + " " + userInfo.getLastName());
Element email2_content = document.getElementById("email2_content");
- email2_content.text("Vous êtes lié à une adresse e-mail. Le code de vérification e-mail pour cette demande est: " + random + ". Veuillez compléter la vérification dans les 5 minutes");
+ email2_content.text("Le code de ramassage de votre colis est " + random + ", veuillez effectuer la verification dans les 5minutes.");
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "取件码" : language == 2 ? "Pickup code" : "Code de prise en charge", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "取件码邮件" : language == 2 ? "Pickup code" : "Code de ramassage", document.html());
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
if(!file.exists()){
@@ -1031,24 +1133,13 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
- FileInputStream fileInputStream = new FileInputStream(file);
- File file1 = new File("/usr/local/nginx/html/files/pdf/");
- if(!file1.exists()){
- file1.mkdirs();
- }
- file1 = new File("/usr/local/nginx/html/files/pdf/code_" + orderId + ".pdf");
- if(!file1.exists()){
- file1.createNewFile();
- }
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
String link ="http://182.160.16.251:81/files/html/code_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(userInfo.getId());
tEmail.setType(1);
- tEmail.setName(language == 1 ? "取件码" : language == 2 ? "Pickup code" : "Code de prise en charge");
+ tEmail.setName(language == 1 ? "取件码邮件" : language == 2 ? "Pickup code" : "Code de ramassage");
tEmail.setOrderId(orderId);
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
@@ -1056,9 +1147,9 @@
tEmail.setWeek(week);
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
}
--
Gitblit v1.7.1