From 07db109f450b6c8a78ac69da49a8f9a893da20c3 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 02 九月 2024 17:53:02 +0800
Subject: [PATCH] 修改bug和翻译
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 735f35f..32c08ec 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
@@ -30,6 +30,8 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileWriter;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -319,12 +321,13 @@
}
Double logistics = uad.getLogistics();
if(null != special){
- map.put("package", logistics * 10);
+ map.put("delivery", logistics * 10);
}
Set<String> strings = map.keySet();
for (TUser user : tUsers) {
if(ToolUtil.isNotEmpty(user.getEmail())){
+ Integer language = user.getLanguage();
for (String key : strings) {
Double aDouble = map.get(key);
String path1 = templatePath + "user/discount.html";
@@ -337,15 +340,15 @@
Element english_ride = document1.getElementById("english_ride");
english_ride.text("Discount for I-GO " + key);
Element english_discount = document1.getElementById("english_discount");
- english_discount.text(" Enjoy " + aDouble + "% off your trip fare.");
+ english_discount.text(" Enjoy " + new BigDecimal((100 - aDouble)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() + "% off your trip fare.");
EmailUtil.send(user.getEmail(), "Discount activities", document1.html());
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
String randomString = ToolUtil.getRandomString(10);
- file = new File("/usr/local/nginx/html/files/html/discount_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/discount_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -354,7 +357,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/discount_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/discount_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(user.getId());
--
Gitblit v1.7.1