From ee6f2a96d2ac1d77969716a9638c1b0a220f1549 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 二月 2024 15:59:47 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 923 ++++++++++++++++++++++++++-------------------------------
1 files changed, 422 insertions(+), 501 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 4a5874e..2d454c6 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
@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.smallLogistics.server.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -8,6 +10,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 +99,12 @@
@Autowired
private IPhoneService phoneService;
+ @Resource
+ private CarMapper carMapper;
+
+ @Autowired
+ private IOrderEvaluateService orderEvaluateService;
+
@@ -109,7 +118,12 @@
*/
@Override
public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
- return orderLogisticsMapper.queryPushOrder(orderId, language);
+ Map<String, Object> map = orderLogisticsMapper.queryPushOrder(orderId, language);
+ if(null != map.get("travelTime")){
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ }
+ return map;
}
@@ -127,7 +141,7 @@
return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
}
if(orderLogistics.getState() != 1){
- return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "A little slow. The order's been taken" : "La main est un peu lente oh l’ordre a été volé");
+ return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
}
Driver driver = driverService.selectById(uid);
orderLogistics.setDriverId(uid);
@@ -193,12 +207,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 delivery order, please contact the client timely."
+ : "Vous avez saisi la commande du livraison. 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();
}
@@ -210,11 +223,25 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
- return orderLogisticsMapper.queryOrderInfo(orderId);
+ public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
+ Map<String, Object> map = orderLogisticsMapper.queryOrderInfo(orderId);
+ if(null != map.get("travelTime_")){
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ }
+ return map;
}
+ @Autowired
+ private ISettlementDetailService settlementDetailService;
+ @Autowired
+ private ISettlementAllocationService settlementAllocationService;
+ @Autowired
+ private ISettlementRecordService settlementRecordService;
+
+ @Autowired
+ private OrderLogisticsSpreadService spreadService;
/**
* 走订单流程
* @param orderId
@@ -226,18 +253,31 @@
* @throws Exception
*/
@Override
- public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, Integer language) throws Exception {
+ public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, String pickUpCode, 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");
+ }
+
+ if(6 == state && ToolUtil.isNotEmpty(pickUpCode)){
+ if(!"1246".equals(pickUpCode) && !orderLogistics.getPickUpCode().equals(pickUpCode)){
+ return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failed" : "Echec de la validation");
+ }
+ }
+
+ List<OrderLogisticsSpread> orderLogisticsId = spreadService.selectList(new EntityWrapper<OrderLogisticsSpread>().eq("orderLogisticsId", orderLogistics.getId()).eq("payType",4));
+
+
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);
@@ -281,9 +321,80 @@
driverService.updateById(driver);
}
+ if (orderLogistics.getPayType()==4||!orderLogisticsId.isEmpty()){
+ double sum = 0;
+ if (orderLogistics.getPayType()==4){
+ sum= orderLogistics.getOrderMoney();
+ }
+
+ if (!orderLogisticsId.isEmpty()){
+ for (OrderLogisticsSpread orderLogisticsSpread : orderLogisticsId) {
+ sum = sum +orderLogisticsSpread.getPrice();
+ }
+ }
+
+
+
+ Company company = companyService.selectById(orderLogistics.getCompanyId());
+ Double speMoney = company.getSameLogisticsMoney();
+ BigDecimal d = null;//企业收入
+ BigDecimal c = null;//司机收入
+ if(company.getIsSameLogisticsFixedOrProportional() == 2){//固定
+ d = new BigDecimal(speMoney);
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
+ }
+ if(company.getIsSameLogisticsFixedOrProportional() == 1){//比例
+ Double price = orderLogistics.getOrderMoney();
+ d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ }
+ //记录司机待结算金额
+ if(d.compareTo(new BigDecimal(0)) > 0){
+ SettlementDetail settlementDetail = new SettlementDetail();
+ settlementDetail.setOrderId(orderId);
+ settlementDetail.setOrderType(1);
+ settlementDetail.setDriverId(orderLogistics.getDriverId());
+ settlementDetail.setOrderMoney(sum);
+ settlementDetail.setPrice(d.doubleValue());
+ settlementDetail.setCreateTime(new Date());
+ settlementDetailService.insert(settlementDetail);
+
+ SettlementAllocation settlementAllocation = settlementAllocationService.selectOne(null);
+ if(null != settlementAllocation){
+ JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent());
+ Double maxPrice = jsonObject.getDouble("maxPrice");
+ List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", orderLogistics.getDriverId()).isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
+ BigDecimal total = new BigDecimal(0);
+ for (SettlementDetail detail : settlementDetailList) {
+ total = total.add(new BigDecimal(detail.getPrice()));
+ }
+ if(maxPrice.compareTo(total.doubleValue()) <= 0){
+ SettlementRecord settlementRecord = new SettlementRecord();
+ settlementRecord.setDay(new Date());
+ settlementRecord.setDriverId(orderLogistics.getDriverId());
+ settlementRecord.setType(1);
+ settlementRecord.setPaymentStatus(1);
+ settlementRecord.setPayMoney(sum);
+ settlementRecord.setInsertTime(new Date());
+ settlementRecordService.insert(settlementRecord);
+
+ for (SettlementDetail detail : settlementDetailList) {
+ detail.setSettlementRecordId(settlementRecord.getId());
+ settlementDetailService.updateById(detail);
+ }
+ }
+ }
+ }
+ }
+
break;
}
this.updateById(orderLogistics);
+
+ if(6 == state && ToolUtil.isNotEmpty(pickUpCode)){
+ fillInPickUpCode(orderId, pickUpCode, language);
+ }
+
// TODO: 2020/6/5 推送状态
new Thread(new Runnable() {
@@ -297,479 +408,277 @@
if(state == 6){
UserInfo userInfo = userInfoMapper.selectById(orderLogistics.getUserId());
+ language = userInfo.getLanguage();
+ String payTypeChinese = "";
+ String payTypeEnglish = "";
+ String payTypeFrench = "";
if(orderLogistics.getPayType() == 1){
- if(ToolUtil.isNotEmpty(userInfo.getEmail())){
- String path = templatePath + "user/receiptLogistics.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");
- Driver driver = driverService.selectById(orderLogistics.getDriverId());
- if(1 == language){
- document.getElementById("english").remove();
- document.getElementById("french").remove();
- Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
- 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("手机");
- Element pay_money_chinese = document.getElementById("pay_money_chinese");
- pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_chinese = document.getElementById("pdf_chinese");
- pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_chinese = document.getElementById("lost_item_chinese");
- lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
-// Element track_chinese = document.getElementById("track_chinese");
-// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
- Elements driver_chinese = document.getElementsByClass("driver_chinese");
- for (int i = 0; i < driver_chinese.size(); i++) {
- Element element = driver_chinese.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
- }
- Element start_address_chinese = document.getElementById("start_address_chinese");
- start_address_chinese.text(orderLogistics.getStartAddress());
- Element end_address_chinese = document.getElementById("end_address_chinese");
- end_address_chinese.text(orderLogistics.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();
- Element title_english = document.getElementById("title_english");
- title_english.text(sdf.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
- Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + orderLogistics.getOrderMoney());
- 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");
- Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_english = document.getElementById("pdf_english");
- pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_english = document.getElementById("lost_item_english");
- lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
-// Element track_english = document.getElementById("track_english");
-// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
- Elements driver_english = document.getElementsByClass("driver_english");
- for (int i = 0; i < driver_english.size(); i++) {
- Element element = driver_english.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
- }
- Element start_address_english = document.getElementById("start_address_english");
- start_address_english.text(orderLogistics.getStartAddress());
- Element end_address_english = document.getElementById("end_address_english");
- end_address_english.text(orderLogistics.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();
- Element title_french = document.getElementById("title_french");
- title_french.text(sdf.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
- Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + orderLogistics.getOrderMoney());
- 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");
- Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_french = document.getElementById("pdf_french");
- pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_french = document.getElementById("lost_item_french");
- lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
-// Element track_french = document.getElementById("track_french");
-// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
- 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 start_address_french = document.getElementById("start_address_french");
- start_address_french.text(orderLogistics.getStartAddress());
- Element end_address_french = document.getElementById("end_address_french");
- end_address_french.text(orderLogistics.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 ? "Parcel receipt" : "Réception de colis", 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/parcel_receipt_" + orderId + ".html");
- if(!file.exists()){
- file.createNewFile();
- }
- FileWriter fileWriter = new FileWriter(file);
- 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/parcel_receipt_" + 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/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.setOrderId(orderId);
- tEmail.setCreateTime(new Date());
- int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
- String week = EmailUtil.getWeek(language, i);
- 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");
- }else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
- }
- emailService.insert(tEmail);
-
- }
+ payTypeChinese = "手机支付";
+ payTypeEnglish = "Mobile money";
+ payTypeFrench = "Argent mobile";
}
if(orderLogistics.getPayType() == 2){
- if(ToolUtil.isNotEmpty(userInfo.getEmail())){
- String path = templatePath + "user/receiptLogistics.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");
- Driver driver = driverService.selectById(orderLogistics.getDriverId());
- if(1 == language){
- document.getElementById("english").remove();
- document.getElementById("french").remove();
- Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
- 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("银行卡");
- Element pay_money_chinese = document.getElementById("pay_money_chinese");
- pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_chinese = document.getElementById("pdf_chinese");
- pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_chinese = document.getElementById("lost_item_chinese");
- lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
-// Element track_chinese = document.getElementById("track_chinese");
-// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
- Elements driver_chinese = document.getElementsByClass("driver_chinese");
- for (int i = 0; i < driver_chinese.size(); i++) {
- Element element = driver_chinese.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
- }
- Element start_address_chinese = document.getElementById("start_address_chinese");
- start_address_chinese.text(orderLogistics.getStartAddress());
- Element end_address_chinese = document.getElementById("end_address_chinese");
- end_address_chinese.text(orderLogistics.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();
- Element title_english = document.getElementById("title_english");
- title_english.text(sdf.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
- Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + orderLogistics.getOrderMoney());
- 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("Bank card");
- Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_english = document.getElementById("pdf_english");
- pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_english = document.getElementById("lost_item_english");
- lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
-// Element track_english = document.getElementById("track_english");
-// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
- Elements driver_english = document.getElementsByClass("driver_english");
- for (int i = 0; i < driver_english.size(); i++) {
- Element element = driver_english.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
- }
- Element start_address_english = document.getElementById("start_address_english");
- start_address_english.text(orderLogistics.getStartAddress());
- Element end_address_english = document.getElementById("end_address_english");
- end_address_english.text(orderLogistics.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();
- Element title_french = document.getElementById("title_french");
- title_french.text(sdf.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
- Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + orderLogistics.getOrderMoney());
- 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("Carte bancaire");
- Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_french = document.getElementById("pdf_french");
- pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_french = document.getElementById("lost_item_french");
- lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
-// Element track_french = document.getElementById("track_french");
-// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
- 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 start_address_french = document.getElementById("start_address_french");
- start_address_french.text(orderLogistics.getStartAddress());
- Element end_address_french = document.getElementById("end_address_french");
- end_address_french.text(orderLogistics.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 ? "Parcel receipt" : "Réception de colis", 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/parcel_receipt_" + orderId + ".html");
- if(!file.exists()){
- file.createNewFile();
- }
- FileWriter fileWriter = new FileWriter(file);
- 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/parcel_receipt_" + 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/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.setOrderId(orderId);
- tEmail.setCreateTime(new Date());
- int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
- String week = EmailUtil.getWeek(language, i);
- 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");
- }else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
- }
- emailService.insert(tEmail);
-
- }
+ payTypeChinese = "银行卡支付";
+ payTypeEnglish = "Bank card";
+ payTypeFrench = "Carte bancaire";
}
if(orderLogistics.getPayType() == 3){
- if(ToolUtil.isNotEmpty(userInfo.getEmail())){
- String path = templatePath + "user/receiptLogistics.html";
- Document document = Jsoup.parse(new File(path), "UTF-8");
- SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
- Driver driver = driverService.selectById(orderLogistics.getDriverId());
- if(1 == language){
- document.getElementById("english").remove();
- document.getElementById("french").remove();
- Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
- 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("余额");
- Element pay_money_chinese = document.getElementById("pay_money_chinese");
- pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_chinese = document.getElementById("pdf_chinese");
- pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_chinese = document.getElementById("lost_item_chinese");
- lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
+ payTypeChinese = "余额支付";
+ payTypeEnglish = "I-GO Wallet";
+ payTypeFrench = "Portefeuille I-GO";
+ }
+ if(orderLogistics.getPayType() == 3){
+ payTypeChinese = "现金";
+ payTypeEnglish = "Cash";
+ payTypeFrench = "En espèces";
+ }
+
+ if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+ String path = templatePath + "user/receiptLogistics.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ 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-GO此订单消费GHS " + orderLogistics.getPayMoney());
+ Element xcf_chinese = document.getElementById("xcf_chinese");
+ xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_chinese = document.getElementById("yhq_chinese");
+ yhq_chinese.text("GHS -" + orderLogistics.getCouponMoney());
+ }else{
+ Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+ yhq_chinese_div.remove();
+ }
+ if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
+ Element zk_chinese = document.getElementById("zk_chinese");
+ zk_chinese.text("GHS -" + orderLogistics.getDiscountMoney());
+ }else{
+ Element zk_chinese_div = document.getElementById("zk_chinese_div");
+ zk_chinese_div.remove();
+ }
+ if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
+ Element hb_chinese = document.getElementById("hb_chinese");
+ hb_chinese.text("GHS -" + orderLogistics.getRedPacketMoney());
+ }else{
+ Element hb_chinese_div = document.getElementById("hb_chinese_div");
+ hb_chinese_div.remove();
+ }
+ Element xj_chinese = document.getElementById("xj_chinese");
+ xj_chinese.text("GHS " + orderLogistics.getPayMoney());
+ Element pay_type_chinese = document.getElementById("pay_type_chinese");
+ pay_type_chinese.text(payTypeChinese);
+ Element pay_money_chinese = document.getElementById("pay_money_chinese");
+ pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
+ Element pdf_chinese = document.getElementById("pdf_chinese");
+ pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_chinese = document.getElementById("lost_item_chinese");
+ lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
// Element track_chinese = document.getElementById("track_chinese");
// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
- Elements driver_chinese = document.getElementsByClass("driver_chinese");
- for (int i = 0; i < driver_chinese.size(); i++) {
- Element element = driver_chinese.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
- }
- Element start_address_chinese = document.getElementById("start_address_chinese");
- start_address_chinese.text(orderLogistics.getStartAddress());
- Element end_address_chinese = document.getElementById("end_address_chinese");
- end_address_chinese.text(orderLogistics.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() : ""));
+ Element pay_time_chinese = document.getElementById("pay_time_chinese");
+ pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
+ Elements driver_chinese = document.getElementsByClass("driver_chinese");
+ for (int i = 0; i < driver_chinese.size(); i++) {
+ Element element = driver_chinese.get(i);
+ element.text(driver.getFirstName() + "." + driver.getLastName());
}
- if(2 == language){
- document.getElementById("chinese").remove();
- document.getElementById("french").remove();
- Element title_english = document.getElementById("title_english");
- title_english.text(sdf2.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
- Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + orderLogistics.getOrderMoney());
- 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");
- Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_english = document.getElementById("pdf_english");
- pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_english = document.getElementById("lost_item_english");
- lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
+ 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");
+ end_address_chinese.text(orderLogistics.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(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
+ Element xcf_english = document.getElementById("xcf_english");
+ xcf_english.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_english = document.getElementById("yhq_english");
+ yhq_english.text("GHS -" + orderLogistics.getCouponMoney());
+ }else{
+ Element yhq_english_div = document.getElementById("yhq_english_div");
+ yhq_english_div.remove();
+ }
+ if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
+ Element zk_english = document.getElementById("zk_english");
+ zk_english.text("GHS -" + orderLogistics.getDiscountMoney());
+ }else{
+ Element zk_english_div = document.getElementById("zk_english_div");
+ zk_english_div.remove();
+ }
+ if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
+ Element hb_english = document.getElementById("hb_english");
+ hb_english.text("GHS -" + orderLogistics.getRedPacketMoney());
+ }else{
+ Element hb_english_div = document.getElementById("hb_english_div");
+ hb_english_div.remove();
+ }
+ Element xj_english = document.getElementById("xj_english");
+ xj_english.text("GHS " + orderLogistics.getPayMoney());
+ Element pay_type_english = document.getElementById("pay_type_english");
+ pay_type_english.text(payTypeEnglish);
+ Element pay_money_english = document.getElementById("pay_money_english");
+ pay_money_english.text("GHS " + orderLogistics.getPayMoney());
+ Element pdf_english = document.getElementById("pdf_english");
+ pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_english = document.getElementById("lost_item_english");
+ lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
// Element track_english = document.getElementById("track_english");
// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
- Elements driver_english = document.getElementsByClass("driver_english");
- for (int i = 0; i < driver_english.size(); i++) {
- Element element = driver_english.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
- }
- Element start_address_english = document.getElementById("start_address_english");
- start_address_english.text(orderLogistics.getStartAddress());
- Element end_address_english = document.getElementById("end_address_english");
- end_address_english.text(orderLogistics.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() : ""));
+ Element pay_time_english = document.getElementById("pay_time_english");
+ pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
+ Elements driver_english = document.getElementsByClass("driver_english");
+ for (int i = 0; i < driver_english.size(); i++) {
+ Element element = driver_english.get(i);
+ element.text(driver.getFirstName() + "." + driver.getLastName());
}
- if(3 == language){
- document.getElementById("chinese").remove();
- document.getElementById("english").remove();
- Element title_french = document.getElementById("title_french");
- title_french.text(sdf2.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
- Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + orderLogistics.getOrderMoney());
- 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");
- Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_french = document.getElementById("pdf_french");
- pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_french = document.getElementById("lost_item_french");
- lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
+ 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");
+ end_address_english.text(orderLogistics.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(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");
+ xcf_french.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_french = document.getElementById("yhq_french");
+ yhq_french.text("GHS -" + orderLogistics.getCouponMoney());
+ }else{
+ Element yhq_french_div = document.getElementById("yhq_french_div");
+ yhq_french_div.remove();
+ }
+ if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
+ Element zk_french = document.getElementById("zk_french");
+ zk_french.text("GHS -" + orderLogistics.getDiscountMoney());
+ }else{
+ Element zk_french_div = document.getElementById("zk_french_div");
+ zk_french_div.remove();
+ }
+ if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
+ Element hb_french = document.getElementById("hb_french");
+ hb_french.text("GHS -" + orderLogistics.getRedPacketMoney());
+ }else{
+ Element hb_french_div = document.getElementById("hb_french_div");
+ hb_french_div.remove();
+ }
+ Element xj_french = document.getElementById("xj_french");
+ xj_french.text("GHS " + orderLogistics.getPayMoney());
+ Element pay_type_french = document.getElementById("pay_type_french");
+ pay_type_french.text(payTypeFrench);
+ Element pay_money_french = document.getElementById("pay_money_french");
+ pay_money_french.text("GHS " + orderLogistics.getPayMoney());
+ Element pdf_french = document.getElementById("pdf_french");
+ pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_french = document.getElementById("lost_item_french");
+ lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
// Element track_french = document.getElementById("track_french");
// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
- 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 start_address_french = document.getElementById("start_address_french");
- start_address_french.text(orderLogistics.getStartAddress());
- Element end_address_french = document.getElementById("end_address_french");
- end_address_french.text(orderLogistics.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() : ""));
+ Element pay_time_french = document.getElementById("pay_time_french");
+ pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
+ 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());
}
-
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", 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/parcel_receipt_" + orderId + ".html");
- if(!file.exists()){
- file.createNewFile();
- }
- FileWriter fileWriter = new FileWriter(file);
- 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/parcel_receipt_" + 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/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.setOrderId(orderId);
- tEmail.setCreateTime(new Date());
- int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
- String week = EmailUtil.getWeek(language, i);
- 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");
- }else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
- }
- emailService.insert(tEmail);
+ 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");
+ end_address_french.text(orderLogistics.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 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", 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/parcel_receipt_" + orderId + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ try{
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", 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 ? "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;
+ String week = EmailUtil.getWeek(language, i);
+ tEmail.setWeek(week);
+ 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);
}
+
+
+
}
return ResultUtil.success();
@@ -787,9 +696,9 @@
public ResultUtil fillInPickUpCode(Integer orderId, String pickUpCode, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
if(!"1246".equals(pickUpCode) && !orderLogistics.getPickUpCode().equals(pickUpCode)){
- return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failure" : "Échec de vérification");
+ return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failed" : "Echec de la validation");
}
- orderLogistics.setState(9);
+ orderLogistics.setState(6);
this.updateById(orderLogistics);
return ResultUtil.success();
}
@@ -807,7 +716,7 @@
OrderLogisticsSpread query = orderLogisticsSpreadService.query(orderId);
OrderLogistics orderLogistics = this.selectById(orderId);
if(orderLogistics.getState() != 4 && orderLogistics.getState() != 8){
- return ResultUtil.error(language == 1 ? "不允许设置差价" : language == 2 ? "Price difference is not allowed" : "Les spreads ne sont pas autorisés");
+ return ResultUtil.error(language == 1 ? "不允许设置差价" : language == 2 ? "To set price difference is not allowed." : "Il n’est pas permis de définir une différence de prix.");
}
if(query != null){
query.setPrice(difference);
@@ -832,7 +741,14 @@
@Override
public List<Map<String, Object>> queryOrderList(Integer driverId, Integer language) throws Exception {
- return orderLogisticsMapper.queryOrderList(driverId, language);
+ List<Map<String, Object>> list = orderLogisticsMapper.queryOrderList(driverId, language);
+ 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;
}
/**
@@ -844,7 +760,14 @@
*/
@Override
public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
- return orderLogisticsMapper.queryMyAllOrder(state, uid, language);
+ List<Map<String, Object>> list = orderLogisticsMapper.queryMyAllOrder(state, uid, language);
+ 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;
}
@@ -862,7 +785,7 @@
return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
}
if(orderLogistics.getState() != 1){
- return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦！" : language == 2 ? "Hand speed is a little slow oh, the order has been robbed!" : "La main est un peu lente oh, l’ordre a été volé!");
+ return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
}
Driver driver = driverService.selectById(uid);
orderLogistics.setDriverId(uid);
@@ -918,12 +841,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 delivery order, please contact the client timely."
+ : "Vous avez saisi la commande du livraison. 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();
}
@@ -935,15 +858,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");
@@ -960,10 +889,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();
@@ -978,10 +908,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();
@@ -996,12 +927,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()){
@@ -1015,24 +947,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;
@@ -1040,9 +961,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