From 821fc2f632f8b974a2c0fc37630e13c5fbe6086c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 26 九月 2025 17:26:16 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 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..084b822 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
@@ -1,19 +1,17 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dao.UserActivityDiscount1Mapper;
import com.stylefeng.guns.modular.system.model.TEmail;
import com.stylefeng.guns.modular.system.model.TUser;
-import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.model.UserActivityDiscount1;
-import com.stylefeng.guns.modular.system.dao.UserActivityDiscount1Mapper;
import com.stylefeng.guns.modular.system.service.ITCompanyService;
import com.stylefeng.guns.modular.system.service.ITUserService;
import com.stylefeng.guns.modular.system.service.IUserActivityDiscount1Service;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.service.TEmailService;
import com.stylefeng.guns.modular.system.util.EmailUtil;
-import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -27,12 +25,9 @@
import javax.annotation.Resource;
import java.io.File;
-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.*;
/**
@@ -339,7 +334,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 +342,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("每单费用折扣" + new BigDecimal(100).subtract(new BigDecimal(aDouble)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() + "%");
EmailUtil.send(user.getEmail(), "折扣活动", document1.html());
}
if(2 == language){
@@ -365,7 +360,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 +368,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,16 +378,16 @@
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 " + (key.equals("ride") ? "course" : "livraison") + ", allez sur la plate-forme I-GO pour voir le détail.");
EmailUtil.send(user.getEmail(), "Activités à rabais", document1.html());
}
//开始生成pdf收据和html收据
- File file = new File("/home/igotechgh/nginx/html/files/html/");
+ File file = new File("/data/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
String randomString = ToolUtil.getRandomString(10);
- file = new File("/home/igotechgh/nginx/html/files/html/discount_" + randomString + ".html");
+ file = new File("/data/nginx/html/files/html/discount_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -406,7 +401,7 @@
tEmail.setLink(link);
tEmail.setUserId(user.getId());
tEmail.setType(1);
- tEmail.setName("Discount activities");
+ tEmail.setName(1 == language ? "折扣活动" : 2 == language ? "Discount activities" : "Activités à rabais");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
tEmail.setWeek(EmailUtil.getWeek(2,i));
--
Gitblit v1.7.1