From adf2ede692b76cf95d0cec80f4087e52d760b219 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 29 九月 2024 17:21:56 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
index 723d671..62373c3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
@@ -339,7 +339,7 @@
Element chinese_user = document1.getElementById("chinese_user");
chinese_user.text("您好 " + user.getNickName() + "，");
Element chinese_ride = document1.getElementById("chinese_ride");
- chinese_ride.text("I-GO" + key + "打折活动奖励");
+ chinese_ride.text("I-GO" + (key.equals("ride") ? "打车" : "包裹") + "折扣活动奖励");
Element chinese_go = document1.getElementById("chinese_go");
if("ride".equals(key)){
chinese_go.text("去打车");
@@ -347,7 +347,7 @@
chinese_go.text("寄包裹");
}
Element chinese_discount = document1.getElementById("chinese_discount");
- chinese_discount.text("每单费用折扣" + new BigDecimal((100 - aDouble)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() + "%");
+ chinese_discount.text("每单费用折扣" + aDouble + "%");
EmailUtil.send(user.getEmail(), "折扣活动", document1.html());
}
if(2 == language){
@@ -365,7 +365,7 @@
english_go.text("REQUEST A DELIVERY");
}
Element english_discount = document1.getElementById("english_discount");
- english_discount.text(" Enjoy " + new BigDecimal((100 - aDouble)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() + "% off your trip fare.");
+ english_discount.text(" Enjoy " + new BigDecimal(100).subtract(new BigDecimal(aDouble)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() + "% off your trip fare.");
EmailUtil.send(user.getEmail(), "Discount activities", document1.html());
}
if(3 == language){
@@ -373,9 +373,9 @@
document1.getElementById("english").remove();
document1.getElementsByTag("title").get(0).text("Activités à rabais");
Element french_user = document1.getElementById("french_user");
- french_user.text("Hello " + user.getNickName() + "，");
+ french_user.text("Cher(ère) " + user.getNickName() + "，");
Element french_ride = document1.getElementById("french_ride");
- french_ride.text("Remise pour I-GO (commande de " + key + ")！");
+ french_ride.text("Remise pour I-GO (commande de " + (key.equals("ride") ? "course" : "livraison") + ")！");
Element french_go = document1.getElementById("french_go");
if("ride".equals(key)){
french_go.text("Déplacez-vous avec I-GO");
@@ -383,7 +383,7 @@
french_go.text("Demander une livraison avec I-GO");
}
Element french_discount = document1.getElementById("french_discount");
- french_discount.text("Profitez aujourd’hui de 10" + new BigDecimal((100 - aDouble)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() + "% de réduction sur les commandes de course, allez sur la plate-forme I-GO pour voir le détail.");
+ french_discount.text("Profitez aujourd’hui de " + new BigDecimal(100).subtract(new BigDecimal(aDouble)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() + "% de réduction sur les commandes de livraison, allez sur la plate-forme I-GO pour voir le détail.");
EmailUtil.send(user.getEmail(), "Activités à rabais", document1.html());
}
//开始生成pdf收据和html收据
--
Gitblit v1.7.1