From d1cc28c9fd86017f4a0a9013554bf1602fef8bc8 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 27 八月 2024 09:15:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..9a744f8 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,7 +321,7 @@
}
Double logistics = uad.getLogistics();
if(null != special){
- map.put("package", logistics * 10);
+ map.put("delivery", logistics * 10);
}
Set<String> strings = map.keySet();
@@ -337,7 +339,8 @@
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/");
--
Gitblit v1.7.1