Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTrave...

luo

2024-02-06 00af90424cffb4cfec8425a660c52d138630f4c9

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

@@ -1061,8 +1061,29 @@
                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
                                Element xcf_chinese = document.getElementById("xcf_chinese");
                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
                                }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());
                                }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());
                                }else{
                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
                                    hb_chinese_div.remove();
                                }
                                Element xj_chinese = document.getElementById("xj_chinese");
                                xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
                                xj_chinese.text("GHS " + orderPrivateCar.getPayMoney());
                                Element pay_type_chinese = document.getElementById("pay_type_chinese");
                                pay_type_chinese.text("余额支付");
                                Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -1106,8 +1127,29 @@
                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
                                Element xcf_english = document.getElementById("xcf_english");
                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
                                }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());
                                }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());
                                }else{
                                    Element hb_english_div = document.getElementById("hb_english_div");
                                    hb_english_div.remove();
                                }
                                Element xj_english = document.getElementById("xj_english");
                                xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
                                xj_english.text("GHS " + orderPrivateCar.getPayMoney());
                                Element pay_type_english = document.getElementById("pay_type_english");
                                pay_type_english.text("I-GO Wallet");
                                Element pay_money_english = document.getElementById("pay_money_english");
@@ -1151,8 +1193,29 @@
                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
                                Element xcf_french = document.getElementById("xcf_french");
                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
                                }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());
                                }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());
                                }else{
                                    Element hb_french_div = document.getElementById("hb_french_div");
                                    hb_french_div.remove();
                                }
                                Element xj_french = document.getElementById("xj_french");
                                xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
                                xj_french.text("GHS " + orderPrivateCar.getPayMoney());
                                Element pay_type_french = document.getElementById("pay_type_french");
                                pay_type_french.text("Portefeuille I-GO");
                                Element pay_money_french = document.getElementById("pay_money_french");
@@ -1377,8 +1440,29 @@
                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
                                Element xcf_chinese = document.getElementById("xcf_chinese");
                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
                                }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());
                                }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());
                                }else{
                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
                                    hb_chinese_div.remove();
                                }
                                Element xj_chinese = document.getElementById("xj_chinese");
                                xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
                                xj_chinese.text("GHS " + orderPrivateCar.getPayMoney());
                                Element pay_type_chinese = document.getElementById("pay_type_chinese");
                                pay_type_chinese.text("现金");
                                Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -1422,8 +1506,29 @@
                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
                                Element xcf_english = document.getElementById("xcf_english");
                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
                                }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());
                                }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());
                                }else{
                                    Element hb_english_div = document.getElementById("hb_english_div");
                                    hb_english_div.remove();
                                }
                                Element xj_english = document.getElementById("xj_english");
                                xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
                                xj_english.text("GHS " + orderPrivateCar.getPayMoney());
                                Element pay_type_english = document.getElementById("pay_type_english");
                                pay_type_english.text("Cash");
                                Element pay_money_english = document.getElementById("pay_money_english");
@@ -1467,8 +1572,29 @@
                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
                                Element xcf_french = document.getElementById("xcf_french");
                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
                                }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());
                                }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());
                                }else{
                                    Element hb_french_div = document.getElementById("hb_french_div");
                                    hb_french_div.remove();
                                }
                                Element xj_french = document.getElementById("xj_french");
                                xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
                                xj_french.text("GHS " + orderPrivateCar.getPayMoney());
                                Element pay_type_french = document.getElementById("pay_type_french");
                                pay_type_french.text("En espèces");
                                Element pay_money_french = document.getElementById("pay_money_french");
@@ -1881,8 +2007,29 @@
                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
                                Element xcf_chinese = document.getElementById("xcf_chinese");
                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
                                }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());
                                }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());
                                }else{
                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
                                    hb_chinese_div.remove();
                                }
                                Element xj_chinese = document.getElementById("xj_chinese");
                                xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
                                xj_chinese.text("GHS " + orderPrivateCar.getPayMoney());
                                Element pay_type_chinese = document.getElementById("pay_type_chinese");
                                pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机支付" : (orderPrivateCar.getPayType() == 2?"银行卡支付":(orderPrivateCar.getPayType() == 3?"余额支付":"现金支付")));
                                Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -1926,8 +2073,29 @@
                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
                                Element xcf_english = document.getElementById("xcf_english");
                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
                                }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());
                                }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());
                                }else{
                                    Element hb_english_div = document.getElementById("hb_english_div");
                                    hb_english_div.remove();
                                }
                                Element xj_english = document.getElementById("xj_english");
                                xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
                                xj_english.text("GHS " + orderPrivateCar.getPayMoney());
                                Element pay_type_english = document.getElementById("pay_type_english");
                                pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile money" :(orderPrivateCar.getPayType() == 2?"Bank card":(orderPrivateCar.getPayType() == 3?"I-GO Wallet":"Cash")));
                                Element pay_money_english = document.getElementById("pay_money_english");
@@ -1971,8 +2139,29 @@
                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
                                Element xcf_french = document.getElementById("xcf_french");
                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
                                }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());
                                }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());
                                }else{
                                    Element hb_french_div = document.getElementById("hb_french_div");
                                    hb_french_div.remove();
                                }
                                Element xj_french = document.getElementById("xj_french");
                                xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
                                xj_french.text("GHS " + orderPrivateCar.getPayMoney());
                                Element pay_type_french = document.getElementById("pay_type_french");
                                pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Argent mobile" : (orderPrivateCar.getPayType() == 2?"Carte bancaire":(orderPrivateCar.getPayType() == 3?"Portefeuille I-GO":"En espèces")));
                                Element pay_money_french = document.getElementById("pay_money_french");