修改2.0 bug

zhibing.pu

2024-08-02 77bca6b387f9349d072b8737e82b42fd7f723be0

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -247,8 +247,8 @@
        if(orderPrivateCars.size() > 0){
            return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
        }
        List<OrderTaxi> list = orderTaxiMapper.queryByState_(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
        if(list.size() > 0){
        int i1 = orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("userId", uid).in("state", Arrays.asList(1, 2, 3, 4, 5, 6, 7, 11, 12)).eq("isDelete", 1));
        if(i1 > 0){
            return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
        }

@@ -263,12 +263,6 @@
            baseWarpper.setState(7);
            baseWarpper.setId(orderPrivateCars.get(0).getId());
            return ResultUtil.success(baseWarpper);
        }


        list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
        if(list.size() > 0 && reservation == 2){
            return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
        }

        startAddress = startAddress.replaceAll("& #40;", "(");
@@ -371,6 +365,9 @@
        orderPrivateCar.setEstimatedMileage(new BigDecimal(distance1).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
        this.insert(orderPrivateCar);
    
        UserInfo userInfo = userInfoService.selectById(uid);
        userInfo.setLanguage(language);
        userInfoService.updateById(userInfo);
    
        new Thread(() -> {
            try {
@@ -416,8 +413,9 @@
        
            }
            String audioUrl = "";
            String fileName = "pushOrder" + orderPrivateCar.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
            try {
                audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, "pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
                audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
@@ -427,7 +425,7 @@
                public void run() {
                    Process process = null;
                    try {
                        process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
                        process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
                    } catch (IOException e) {
                        throw new RuntimeException(e);
                    }
@@ -528,8 +526,9 @@
        
                    }
                    String audioUrl = "";
                    String fileName = "pushOrder" + orderPrivateCar.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
                    try {
                        audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, "pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
                        audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
                    } catch (Exception e) {
                        throw new RuntimeException(e);
                    }
@@ -539,7 +538,7 @@
                        public void run() {
                            Process process = null;
                            try {
                                process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
                                process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
                            } catch (IOException e) {
                                throw new RuntimeException(e);
                            }
@@ -750,7 +749,7 @@
        if(null == orderPrivateCar){
            return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel order, order-information error." : "Échec de l’annulation de la commande, erreur d’information de commande.");
        }
        if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
        if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 12){
            return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");
        }
        
@@ -816,13 +815,25 @@
                    String audioUrl = "";
                    switch (language1){
                        case 1:
                            audioUrl = "http://182.160.16.251:81/files/audio/UserCancelledOrder-CN.mp3";
                            if(orderPrivateCar.getState() == 6){
                                audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-CN.mp3";
                            }else{
                                audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-CN.mp3";
                            }
                            break;
                        case 2:
                            audioUrl = "http://182.160.16.251:81/files/audio/UserCancelledOrder-EN.mp3";
                            if(orderPrivateCar.getState() == 6){
                                audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-EN.mp3";
                            }else{
                                audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-EN.mp3";
                            }
                            break;
                        case 3:
                            audioUrl = "http://182.160.16.251:81/files/audio/UserCancelledOrder-FR.mp3";
                            if(orderPrivateCar.getState() == 6){
                                audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-FR.mp3";
                            }else{
                                audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-FR.mp3";
                            }
                            break;
                    }
                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
@@ -1052,8 +1063,9 @@
        
                                }
                                String audioUrl = "";
                                String fileName = "pushOrder" + orderPrivateCar.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
                                try {
                                    audioUrl = TextToSpeechUtil.create(language == 1 ? "cmn-CN" : language == 2 ? "en-US" : "fr-FR", text, "pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
                                    audioUrl = TextToSpeechUtil.create(language == 1 ? "cmn-CN" : language == 2 ? "en-US" : "fr-FR", text, fileName);
                                } catch (Exception e) {
                                    throw new RuntimeException(e);
                                }
@@ -1063,7 +1075,7 @@
                                    public void run() {
                                        Process process = null;
                                        try {
                                            process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
                                            process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
                                        } catch (IOException e) {
                                            throw new RuntimeException(e);
                                        }
@@ -1423,8 +1435,43 @@
                                document.getElementsByTag("title").get(0).text("I-GO电子收据");
                                Element title_chinese = document.getElementById("title_chinese");
                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                Element xcf_chinese = document.getElementById("xcf_chinese");
                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element qbj_chinese = document.getElementById("qbj_chinese");
                                qbj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element scf_chinese = document.getElementById("scf_chinese");
                                if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
                                    scf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element scf_chinese_div = document.getElementById("scf_chinese_div");
                                    scf_chinese_div.remove();
                                }
                                Element lcf_chinese = document.getElementById("lcf_chinese");
                                if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
                                    lcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
                                    lcf_chinese_div.remove();
                                }
                                Element ddf_chinese = document.getElementById("ddf_chinese");
                                if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
                                    ddf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
                                    ddf_chinese_div.remove();
                                }
                                Element glf_chinese = document.getElementById("glf_chinese");
                                if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
                                    glf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element glf_chinese_div = document.getElementById("glf_chinese_div");
                                    glf_chinese_div.remove();
                                }
                                Element tcf_chinese = document.getElementById("tcf_chinese");
                                if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
                                    tcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
                                    tcf_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1489,8 +1536,43 @@
                                document.getElementsByTag("title").get(0).text("Receipt");
                                Element title_english = document.getElementById("title_english");
                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
                                Element xcf_english = document.getElementById("xcf_english");
                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element qbj_english = document.getElementById("qbj_english");
                                qbj_english.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element scf_english = document.getElementById("scf_english");
                                if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
                                    scf_english.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element scf_english_div = document.getElementById("scf_english_div");
                                    scf_english_div.remove();
                                }
                                Element lcf_english = document.getElementById("lcf_english");
                                if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
                                    lcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element lcf_english_div = document.getElementById("lcf_english_div");
                                    lcf_english_div.remove();
                                }
                                Element ddf_english = document.getElementById("ddf_english");
                                if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
                                    ddf_english.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element ddf_english_div = document.getElementById("ddf_english_div");
                                    ddf_english_div.remove();
                                }
                                Element glf_english = document.getElementById("glf_english");
                                if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
                                    glf_english.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element glf_english_div = document.getElementById("glf_english_div");
                                    glf_english_div.remove();
                                }
                                Element tcf_english = document.getElementById("tcf_english");
                                if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
                                    tcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element tcf_english_div = document.getElementById("tcf_english_div");
                                    tcf_english_div.remove();
                                }
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1555,8 +1637,43 @@
                                document.getElementsByTag("title").get(0).text("Reçu");
                                Element title_french = document.getElementById("title_french");
                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
                                Element xcf_french = document.getElementById("xcf_french");
                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element qbj_french = document.getElementById("qbj_french");
                                qbj_french.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element scf_french = document.getElementById("scf_french");
                                if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
                                    scf_french.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element scf_french_div = document.getElementById("scf_french_div");
                                    scf_french_div.remove();
                                }
                                Element lcf_french = document.getElementById("lcf_french");
                                if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
                                    lcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element lcf_french_div = document.getElementById("lcf_french_div");
                                    lcf_french_div.remove();
                                }
                                Element ddf_french = document.getElementById("ddf_french");
                                if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
                                    ddf_french.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element ddf_french_div = document.getElementById("ddf_french_div");
                                    ddf_french_div.remove();
                                }
                                Element glf_french = document.getElementById("glf_french");
                                if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
                                    glf_french.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element glf_french_div = document.getElementById("glf_french_div");
                                    glf_french_div.remove();
                                }
                                Element tcf_french = document.getElementById("tcf_french");
                                if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
                                    tcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element tcf_french_div = document.getElementById("tcf_french_div");
                                    tcf_french_div.remove();
                                }
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1835,8 +1952,43 @@
                                document.getElementsByTag("title").get(0).text("I-GO电子收据");
                                Element title_chinese = document.getElementById("title_chinese");
                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                Element xcf_chinese = document.getElementById("xcf_chinese");
                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element qbj_chinese = document.getElementById("qbj_chinese");
                                qbj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element scf_chinese = document.getElementById("scf_chinese");
                                if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
                                    scf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element scf_chinese_div = document.getElementById("scf_chinese_div");
                                    scf_chinese_div.remove();
                                }
                                Element lcf_chinese = document.getElementById("lcf_chinese");
                                if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
                                    lcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
                                    lcf_chinese_div.remove();
                                }
                                Element ddf_chinese = document.getElementById("ddf_chinese");
                                if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
                                    ddf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
                                    ddf_chinese_div.remove();
                                }
                                Element glf_chinese = document.getElementById("glf_chinese");
                                if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
                                    glf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element glf_chinese_div = document.getElementById("glf_chinese_div");
                                    glf_chinese_div.remove();
                                }
                                Element tcf_chinese = document.getElementById("tcf_chinese");
                                if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
                                    tcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
                                    tcf_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1901,8 +2053,43 @@
                                document.getElementsByTag("title").get(0).text("Receipt");
                                Element title_english = document.getElementById("title_english");
                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
                                Element xcf_english = document.getElementById("xcf_english");
                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element qbj_english = document.getElementById("qbj_english");
                                qbj_english.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element scf_english = document.getElementById("scf_english");
                                if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
                                    scf_english.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element scf_english_div = document.getElementById("scf_english_div");
                                    scf_english_div.remove();
                                }
                                Element lcf_english = document.getElementById("lcf_english");
                                if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
                                    lcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element lcf_english_div = document.getElementById("lcf_english_div");
                                    lcf_english_div.remove();
                                }
                                Element ddf_english = document.getElementById("ddf_english");
                                if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
                                    ddf_english.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element ddf_english_div = document.getElementById("ddf_english_div");
                                    ddf_english_div.remove();
                                }
                                Element glf_english = document.getElementById("glf_english");
                                if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
                                    glf_english.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element glf_english_div = document.getElementById("glf_english_div");
                                    glf_english_div.remove();
                                }
                                Element tcf_english = document.getElementById("tcf_english");
                                if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
                                    tcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element tcf_english_div = document.getElementById("tcf_english_div");
                                    tcf_english_div.remove();
                                }
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1967,8 +2154,43 @@
                                document.getElementsByTag("title").get(0).text("Reçu");
                                Element title_french = document.getElementById("title_french");
                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
                                Element xcf_french = document.getElementById("xcf_french");
                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element qbj_french = document.getElementById("qbj_french");
                                qbj_french.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element scf_french = document.getElementById("scf_french");
                                if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
                                    scf_french.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element scf_french_div = document.getElementById("scf_french_div");
                                    scf_french_div.remove();
                                }
                                Element lcf_french = document.getElementById("lcf_french");
                                if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
                                    lcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element lcf_french_div = document.getElementById("lcf_french_div");
                                    lcf_french_div.remove();
                                }
                                Element ddf_french = document.getElementById("ddf_french");
                                if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
                                    ddf_french.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element ddf_french_div = document.getElementById("ddf_french_div");
                                    ddf_french_div.remove();
                                }
                                Element glf_french = document.getElementById("glf_french");
                                if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
                                    glf_french.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element glf_french_div = document.getElementById("glf_french_div");
                                    glf_french_div.remove();
                                }
                                Element tcf_french = document.getElementById("tcf_french");
                                if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
                                    tcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element tcf_french_div = document.getElementById("tcf_french_div");
                                    tcf_french_div.remove();
                                }
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2093,7 +2315,7 @@
                public void run() {
                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
                    pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
                    pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getPayMoney());
                }
            }).start();

@@ -2406,8 +2628,43 @@
                                document.getElementsByTag("title").get(0).text("I-GO电子收据");
                                Element title_chinese = document.getElementById("title_chinese");
                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                Element xcf_chinese = document.getElementById("xcf_chinese");
                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element qbj_chinese = document.getElementById("qbj_chinese");
                                qbj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element scf_chinese = document.getElementById("scf_chinese");
                                if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
                                    scf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element scf_chinese_div = document.getElementById("scf_chinese_div");
                                    scf_chinese_div.remove();
                                }
                                Element lcf_chinese = document.getElementById("lcf_chinese");
                                if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
                                    lcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
                                    lcf_chinese_div.remove();
                                }
                                Element ddf_chinese = document.getElementById("ddf_chinese");
                                if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
                                    ddf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
                                    ddf_chinese_div.remove();
                                }
                                Element glf_chinese = document.getElementById("glf_chinese");
                                if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
                                    glf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element glf_chinese_div = document.getElementById("glf_chinese_div");
                                    glf_chinese_div.remove();
                                }
                                Element tcf_chinese = document.getElementById("tcf_chinese");
                                if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
                                    tcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
                                    tcf_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2472,8 +2729,43 @@
                                document.getElementsByTag("title").get(0).text("Receipt");
                                Element title_english = document.getElementById("title_english");
                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
                                Element xcf_english = document.getElementById("xcf_english");
                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element qbj_english = document.getElementById("qbj_english");
                                qbj_english.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element scf_english = document.getElementById("scf_english");
                                if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
                                    scf_english.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element scf_english_div = document.getElementById("scf_english_div");
                                    scf_english_div.remove();
                                }
                                Element lcf_english = document.getElementById("lcf_english");
                                if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
                                    lcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element lcf_english_div = document.getElementById("lcf_english_div");
                                    lcf_english_div.remove();
                                }
                                Element ddf_english = document.getElementById("ddf_english");
                                if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
                                    ddf_english.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element ddf_english_div = document.getElementById("ddf_english_div");
                                    ddf_english_div.remove();
                                }
                                Element glf_english = document.getElementById("glf_english");
                                if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
                                    glf_english.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element glf_english_div = document.getElementById("glf_english_div");
                                    glf_english_div.remove();
                                }
                                Element tcf_english = document.getElementById("tcf_english");
                                if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
                                    tcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element tcf_english_div = document.getElementById("tcf_english_div");
                                    tcf_english_div.remove();
                                }
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2538,8 +2830,43 @@
                                document.getElementsByTag("title").get(0).text("Reçu");
                                Element title_french = document.getElementById("title_french");
                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
                                Element xcf_french = document.getElementById("xcf_french");
                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element qbj_french = document.getElementById("qbj_french");
                                qbj_french.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                Element scf_french = document.getElementById("scf_french");
                                if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
                                    scf_french.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element scf_french_div = document.getElementById("scf_french_div");
                                    scf_french_div.remove();
                                }
                                Element lcf_french = document.getElementById("lcf_french");
                                if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
                                    lcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element lcf_french_div = document.getElementById("lcf_french_div");
                                    lcf_french_div.remove();
                                }
                                Element ddf_french = document.getElementById("ddf_french");
                                if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
                                    ddf_french.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element ddf_french_div = document.getElementById("ddf_french_div");
                                    ddf_french_div.remove();
                                }
                                Element glf_french = document.getElementById("glf_french");
                                if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
                                    glf_french.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element glf_french_div = document.getElementById("glf_french_div");
                                    glf_french_div.remove();
                                }
                                Element tcf_french = document.getElementById("tcf_french");
                                if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
                                    tcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element tcf_french_div = document.getElementById("tcf_french_div");
                                    tcf_french_div.remove();
                                }
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2752,6 +3079,11 @@
        if(state == 11){
            map.put("state", map.get("oldState"));
        }
        if(state == 12){
            OrderCancel query = orderCancelService.query(orderId, 1, null, null, 1);
            map.put("cancelPayMoney", null == query ? 0 : query.getMoney());
            map.put("cancelMoney", null == query ? 0 : query.getMoney());
        }
        if(Integer.valueOf(String.valueOf(map.get("state"))) != 8 && Integer.valueOf(String.valueOf(map.get("state"))) != 9){
            map.put("redPacketMoney", null);
            map.put("couponMoney", null);
@@ -2762,6 +3094,7 @@
                Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
                if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
                    Double special = query2.getSpecial();
                    map.put("discount", special);
                    orderPrivateCar.setDiscount(special);
                    Double orderMoney = orderPrivateCar.getOrderMoney();
                    double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
@@ -2990,13 +3323,13 @@
            String audioUrl = "";
            switch (language1){
                case 1:
                    audioUrl = "http://182.160.16.251:81/files/audio/ChangeAddress-CN.mp3";
                    audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-CN.mp3";
                    break;
                case 2:
                    audioUrl = "http://182.160.16.251:81/files/audio/ChangeAddress-EN.mp3";
                    audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-EN.mp3";
                    break;
                case 3:
                    audioUrl = "http://182.160.16.251:81/files/audio/ChangeAddress-FR.mp3";
                    audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-FR.mp3";
                    break;
            }
            pushUtil.pushModifyAddress(2, orderPrivateCar.getDriverId(), orderId, 1, 1, audioUrl);