From cc22cce6e87c19b8c83382e2a1b728f4bd5fcde3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 30 一月 2024 16:47:50 +0800
Subject: [PATCH] 大区查询修改
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 cd38bc4..6fe0cac 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
@@ -1064,7 +1064,7 @@
Element xj_chinese = document.getElementById("xj_chinese");
xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_chinese = document.getElementById("pay_type_chinese");
- pay_type_chinese.text("余额");
+ pay_type_chinese.text("余额支付");
Element pay_money_chinese = document.getElementById("pay_money_chinese");
pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_chinese = document.getElementById("pdf_chinese");
@@ -1109,7 +1109,7 @@
Element xj_english = document.getElementById("xj_english");
xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text("Balance");
+ pay_type_english.text("I-GO Wallet");
Element pay_money_english = document.getElementById("pay_money_english");
pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_english = document.getElementById("pdf_english");
@@ -1154,7 +1154,7 @@
Element xj_french = document.getElementById("xj_french");
xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("Le solde");
+ pay_type_french.text("Portefeuille I-GO");
Element pay_money_french = document.getElementById("pay_money_french");
pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_french = document.getElementById("pdf_french");
@@ -1232,9 +1232,9 @@
tEmail.setWeek(EmailUtil.getWeek(language,i));
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
@@ -1470,7 +1470,7 @@
Element xj_french = document.getElementById("xj_french");
xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("Espèces");
+ pay_type_french.text("En espèces");
Element pay_money_french = document.getElementById("pay_money_french");
pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_french = document.getElementById("pdf_french");
@@ -1548,9 +1548,9 @@
tEmail.setWeek(EmailUtil.getWeek(language,i));
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
@@ -1719,9 +1719,9 @@
tEmail.setWeek(EmailUtil.getWeek(language,i));
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
@@ -1884,7 +1884,7 @@
Element xj_chinese = document.getElementById("xj_chinese");
xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_chinese = document.getElementById("pay_type_chinese");
- pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机" : "银行卡");
+ pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机支付" : (orderPrivateCar.getPayType() == 2?"银行卡支付":(orderPrivateCar.getPayType() == 3?"余额支付":"现金支付")));
Element pay_money_chinese = document.getElementById("pay_money_chinese");
pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_chinese = document.getElementById("pdf_chinese");
@@ -1929,7 +1929,7 @@
Element xj_english = document.getElementById("xj_english");
xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Bank card");
+ 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");
pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_english = document.getElementById("pdf_english");
@@ -1974,7 +1974,7 @@
Element xj_french = document.getElementById("xj_french");
xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Carte bancaire");
+ 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");
pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
Element pdf_french = document.getElementById("pdf_french");
@@ -2054,9 +2054,9 @@
tEmail.setWeek(EmailUtil.getWeek(language,i));
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
--
Gitblit v1.7.1