更新接口

puzhibing

2023-12-13 af6d43a41205f8c7fc1a965cb019c039063bf4f0

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java

@@ -109,7 +109,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 +132,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,11 +198,181 @@
        }).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());

        UserInfo userInfo = userInfoMapper.selectById(orderLogistics.getUserId());
        if(ToolUtil.isNotEmpty(userInfo.getEmail())){
            new Thread(new Runnable() {
                @Override
                public void run() {
                    try {
                        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();
                            document.getElementsByTag("title").get(0).text("包裹收据");
                            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");
                            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(orderLogistics.getPayType() == 1 ? "手机" : orderLogistics.getPayType() == 2 ? "银行卡" : orderLogistics.getPayType() == 3 ? "余额" : "现金");
                            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(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());
                            }
                            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("Package 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());
                            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(orderLogistics.getPayType() == 1 ? "Mobile" : orderLogistics.getPayType() == 2 ? "Bank card" : orderLogistics.getPayType() == 3 ? "Balance" : "Cash");
                            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(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());
                            }
                            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 de colis");
                            Element title_french = document.getElementById("title_french");
                            title_french.text("Le " + DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + ", vous avez dépensé GHS " + orderLogistics.getPayMoney() + " sur le voyage");
                            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(orderLogistics.getPayType() == 1 ? "Mobile" : orderLogistics.getPayType() == 2 ? "Carte bancaire" : orderLogistics.getPayType() == 3 ? "Le solde" : "Espèces");
                            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(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());
                            }
                            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 ? "Package receipt" : "Reçu 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(uid);
                        tEmail.setType(1);
                        tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Package receipt" : "Reçu 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);

                    }catch (Exception e){
                        e.printStackTrace();
                    }
                }
            }).start();
        }

        return ResultUtil.success();
    }
@@ -210,8 +385,13 @@
     * @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;
    }


@@ -232,12 +412,12 @@
            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);
@@ -302,13 +482,14 @@
                    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");
                    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();
                        document.getElementsByTag("title").get(0).text("包裹收据");
                        Element title_chinese = document.getElementById("title_chinese");
                        title_chinese.text(sdf.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        title_chinese.text(DateUtil.conversionFormat(language, 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");
@@ -324,7 +505,7 @@
//                    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()));
                        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);
@@ -341,8 +522,9 @@
                    if(2 == language){
                        document.getElementById("chinese").remove();
                        document.getElementById("french").remove();
                        document.getElementsByTag("title").get(0).text("Package receipt");
                        Element title_english = document.getElementById("title_english");
                        title_english.text(sdf.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
                        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");
                        xcf_english.text("GHS " + orderLogistics.getOrderMoney());
                        Element xj_english = document.getElementById("xj_english");
@@ -358,7 +540,7 @@
//                    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()));
                        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);
@@ -375,8 +557,9 @@
                    if(3 == language){
                        document.getElementById("chinese").remove();
                        document.getElementById("english").remove();
                        document.getElementsByTag("title").get(0).text("Reçu de colis");
                        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 ");
                        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");
                        xcf_french.text("GHS " + orderLogistics.getOrderMoney());
                        Element xj_french = document.getElementById("xj_french");
@@ -392,7 +575,7 @@
//                    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()));
                        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);
@@ -407,7 +590,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 ? "包裹收据" : language == 2 ? "Package receipt" : "Reçu de colis",  document.html());

                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
@@ -439,7 +622,7 @@
                    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 ? "包裹收据" : language == 2 ? "Package receipt" : "Reçu de colis");
                    tEmail.setOrderId(orderId);
                    tEmail.setCreateTime(new Date());
                    int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
@@ -460,13 +643,14 @@
                    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");
                    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();
                        document.getElementsByTag("title").get(0).text("包裹收据");
                        Element title_chinese = document.getElementById("title_chinese");
                        title_chinese.text(sdf.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        title_chinese.text(DateUtil.conversionFormat(language, 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");
@@ -482,7 +666,7 @@
//                    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()));
                        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);
@@ -499,8 +683,9 @@
                    if(2 == language){
                        document.getElementById("chinese").remove();
                        document.getElementById("french").remove();
                        document.getElementsByTag("title").get(0).text("Package receipt");
                        Element title_english = document.getElementById("title_english");
                        title_english.text(sdf.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
                        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");
                        xcf_english.text("GHS " + orderLogistics.getOrderMoney());
                        Element xj_english = document.getElementById("xj_english");
@@ -516,7 +701,7 @@
//                    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()));
                        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);
@@ -533,8 +718,9 @@
                    if(3 == language){
                        document.getElementById("chinese").remove();
                        document.getElementById("english").remove();
                        document.getElementsByTag("title").get(0).text("Reçu de colis");
                        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 ");
                        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");
                        xcf_french.text("GHS " + orderLogistics.getOrderMoney());
                        Element xj_french = document.getElementById("xj_french");
@@ -550,7 +736,7 @@
//                    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()));
                        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);
@@ -565,7 +751,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 ? "包裹收据" : language == 2 ? "Package receipt" : "Reçu de colis",  document.html());

                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
@@ -597,7 +783,7 @@
                    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 ? "包裹收据" : language == 2 ? "Package receipt" : "Reçu de colis");
                    tEmail.setOrderId(orderId);
                    tEmail.setCreateTime(new Date());
                    int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
@@ -618,13 +804,14 @@
                    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");
                    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();
                        document.getElementsByTag("title").get(0).text("包裹收据");
                        Element title_chinese = document.getElementById("title_chinese");
                        title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        title_chinese.text(DateUtil.conversionFormat(language, 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");
@@ -640,7 +827,7 @@
//                    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()));
                        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);
@@ -657,8 +844,9 @@
                    if(2 == language){
                        document.getElementById("chinese").remove();
                        document.getElementById("french").remove();
                        document.getElementsByTag("title").get(0).text("Package receipt");
                        Element title_english = document.getElementById("title_english");
                        title_english.text(sdf2.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
                        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());
                        Element xj_english = document.getElementById("xj_english");
@@ -674,7 +862,7 @@
//                    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()));
                        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);
@@ -691,8 +879,9 @@
                    if(3 == language){
                        document.getElementById("chinese").remove();
                        document.getElementById("english").remove();
                        document.getElementsByTag("title").get(0).text("Reçu de colis");
                        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 ");
                        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());
                        Element xj_french = document.getElementById("xj_french");
@@ -708,7 +897,7 @@
//                    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()));
                        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);
@@ -723,7 +912,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 ? "包裹收据" : language == 2 ? "Package receipt" : "Reçu de colis",  document.html());

                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
@@ -755,7 +944,7 @@
                    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 ? "包裹收据" : language == 2 ? "Package receipt" : "Reçu de colis");
                    tEmail.setOrderId(orderId);
                    tEmail.setCreateTime(new Date());
                    int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
@@ -787,7 +976,7 @@
    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);
        this.updateById(orderLogistics);
@@ -807,7 +996,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 +1021,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 +1040,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 +1065,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 +1121,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();
    }
@@ -960,10 +1163,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 +1182,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 +1201,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()){
@@ -1032,7 +1238,7 @@
            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;