From 77bca6b387f9349d072b8737e82b42fd7f723be0 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 02 八月 2024 18:07:39 +0800
Subject: [PATCH] 修改2.0 bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 361 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 335 insertions(+), 26 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index d4cd91c..a72144f 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/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;", "(");
@@ -1441,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));
@@ -1507,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));
@@ -1573,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));
@@ -1853,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));
@@ -1919,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));
@@ -1985,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));
@@ -2424,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));
@@ -2490,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));
@@ -2556,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));
--
Gitblit v1.7.1