提交1.0版本

zhibing.pu

2024-04-10 1ae4441cd5bab107d0eec55817e07129fdc84297

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

@@ -321,13 +321,8 @@
            if(query.size() == 0){
                return ResultUtil.error(language == 1 ? "该司机不能服务此业务" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
            }

            int count = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driverId).eq("driverPay", 1).in("state", Arrays.asList(7, 8, 9)).eq("isDelete", 1));
            int count = settlementRecordService.selectCount(new EntityWrapper<SettlementRecord>().eq("driverId", driverId).eq("paymentStatus", 1));
            if(count > 0){
                return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
            }
            int count1 = orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("driverId", driverId).eq("driverPay", 1).ne("state", 10).eq("isDelete", 1));
            if(count1 > 0){
                return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
            }

@@ -903,7 +898,7 @@
        UserCouponRecord userCouponRecord = null;
        if(null != couponId){
            userCouponRecord = userCouponRecordService.selectById(couponId);
            if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
            if(!userCouponRecord.getCompanyId().equals(orderPrivateCar.getCompanyId())){
                return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
            }
            if(userCouponRecord.getState() == 2){
@@ -1060,24 +1055,24 @@
                                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 " + orderPrivateCar.getOrderMoney());
                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
                                    yhq_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_chinese = document.getElementById("zk_chinese");
                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
                                    zk_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_chinese = document.getElementById("hb_chinese");
                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
                                    hb_chinese_div.remove();
@@ -1099,7 +1094,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_chinese = document.getElementById("cp_chinese");
                                cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -1126,24 +1121,24 @@
                                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 " + orderPrivateCar.getOrderMoney());
                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_english_div = document.getElementById("yhq_english_div");
                                    yhq_english_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_english = document.getElementById("zk_english");
                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_english_div = document.getElementById("zk_english_div");
                                    zk_english_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_english = document.getElementById("hb_english");
                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_english_div = document.getElementById("hb_english_div");
                                    hb_english_div.remove();
@@ -1165,7 +1160,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_english = document.getElementById("cp_english");
                                cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -1192,24 +1187,24 @@
                                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 " + orderPrivateCar.getOrderMoney());
                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_french_div = document.getElementById("yhq_french_div");
                                    yhq_french_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_french = document.getElementById("zk_french");
                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_french_div = document.getElementById("zk_french_div");
                                    zk_french_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_french = document.getElementById("hb_french");
                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_french_div = document.getElementById("hb_french_div");
                                    hb_french_div.remove();
@@ -1231,7 +1226,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_french = document.getElementById("cp_french");
                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());
@@ -1474,24 +1469,24 @@
                                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 " + orderPrivateCar.getOrderMoney());
                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
                                    yhq_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_chinese = document.getElementById("zk_chinese");
                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
                                    zk_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_chinese = document.getElementById("hb_chinese");
                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
                                    hb_chinese_div.remove();
@@ -1513,7 +1508,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_chinese = document.getElementById("cp_chinese");
                                cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -1540,24 +1535,24 @@
                                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 " + orderPrivateCar.getOrderMoney());
                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_english_div = document.getElementById("yhq_english_div");
                                    yhq_english_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_english = document.getElementById("zk_english");
                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_english_div = document.getElementById("zk_english_div");
                                    zk_english_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_english = document.getElementById("hb_english");
                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_english_div = document.getElementById("hb_english_div");
                                    hb_english_div.remove();
@@ -1579,7 +1574,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_english = document.getElementById("cp_english");
                                cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -1606,24 +1601,24 @@
                                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 " + orderPrivateCar.getOrderMoney());
                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_french_div = document.getElementById("yhq_french_div");
                                    yhq_french_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_french = document.getElementById("zk_french");
                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_french_div = document.getElementById("zk_french_div");
                                    zk_french_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_french = document.getElementById("hb_french");
                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_french_div = document.getElementById("hb_french_div");
                                    hb_french_div.remove();
@@ -1645,7 +1640,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_french = document.getElementById("cp_french");
                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());
@@ -2041,24 +2036,24 @@
                                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 " + orderPrivateCar.getOrderMoney());
                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
                                    yhq_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_chinese = document.getElementById("zk_chinese");
                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
                                    zk_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_chinese = document.getElementById("hb_chinese");
                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
                                    hb_chinese_div.remove();
@@ -2080,7 +2075,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_chinese = document.getElementById("cp_chinese");
                                cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -2107,24 +2102,24 @@
                                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 " + orderPrivateCar.getOrderMoney());
                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_english_div = document.getElementById("yhq_english_div");
                                    yhq_english_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_english = document.getElementById("zk_english");
                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_english_div = document.getElementById("zk_english_div");
                                    zk_english_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_english = document.getElementById("hb_english");
                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_english_div = document.getElementById("hb_english_div");
                                    hb_english_div.remove();
@@ -2146,7 +2141,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_english = document.getElementById("cp_english");
                                cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -2173,24 +2168,24 @@
                                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 " + orderPrivateCar.getOrderMoney());
                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_french_div = document.getElementById("yhq_french_div");
                                    yhq_french_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_french = document.getElementById("zk_french");
                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_french_div = document.getElementById("zk_french_div");
                                    zk_french_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_french = document.getElementById("hb_french");
                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_french_div = document.getElementById("hb_french_div");
                                    hb_french_div.remove();
@@ -2212,7 +2207,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_french = document.getElementById("cp_french");
                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());