From dae4651a80ac06f432a2ff448a199afb6dc0d2b3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 十二月 2023 18:17:14 +0800
Subject: [PATCH] 更新
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 508 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 476 insertions(+), 32 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 67a83c8..9e2f499 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -21,6 +21,7 @@
import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
import com.stylefeng.guns.modular.system.util.Tingg.TinggPayUtil;
import com.stylefeng.guns.modular.system.util.Tingg.model.CheckoutRequest;
+import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
import com.stylefeng.guns.modular.system.warpper.LoginWarpper;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
@@ -40,6 +41,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -116,6 +120,9 @@
@Autowired
private SMSUtil smsUtil;
+ @Autowired
+ private TEmailService emailService;
+
/**
* 获取短信验证码
@@ -163,6 +170,7 @@
@Override
public boolean checkCaptcha(String phone, String code) throws Exception {
Object value = redisUtil.getValue(phone);
+ redisUtil.remove(phone);
if("1246".equals(code)){
return true;
}
@@ -187,7 +195,7 @@
Integer userType, Integer language) throws Exception {
boolean b = this.checkCaptcha(phone, code);
if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
UserInfo userInfo = userInfoMapper.queryByPhone(phone);
@@ -252,6 +260,49 @@
user_french.text("Bonjour " + userInfo.getNickName() + "，");
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie", document.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ String randomString = ToolUtil.getRandomString(10);
+ file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/registration_" + randomString + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ 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");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ }
+ emailService.insert(tEmail);
+
}
this.addCoupon(userInfo, language);//添加优惠券
@@ -320,8 +371,51 @@
user2_content.text("Vous avez invité avec succès un utilisateur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "邀请奖励" : language == 2 ? "invitation bonus" : "prime d'invitation", document1.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ String randomString = ToolUtil.getRandomString(10);
+ file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/invitation_" + randomString + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "邀请奖励" : language == 2 ? "invitation bonus" : "prime d'invitation");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ 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");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ }
+ emailService.insert(tEmail);
}
}
+
if(type == 1){//用户分享
UserInfo userInfo1 = userInfoMapper.selectById(uid);
List<Map<String, Object>> query = userActivityInviteMapper.query(userInfo1.getCompanyId());
@@ -330,6 +424,8 @@
Double lavePrice = Double.valueOf(map.get("lavePrice").toString());
String startTime = map.get("startTime").toString();
String endTime = map.get("endTime").toString();
+ map.put("startTime", DateUtil.conversionFormat(language, startTime));
+ map.put("endTime", DateUtil.conversionFormat(language, endTime));
int num = 0;
for(int i = Integer.valueOf(String.valueOf(map.get("totalNum"))); i > 0; i--){
//判断当前优惠券金额是否大于可发放剩余总金额
@@ -395,6 +491,48 @@
french_date.text("Cette promotion est valide du" + startTime + "au" + endTime);
}
EmailUtil.send(userInfo1.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive", document1.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ String randomString = ToolUtil.getRandomString(10);
+ file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/coupon_" + randomString + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ 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");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ }
+ emailService.insert(tEmail);
}
}
@@ -402,7 +540,7 @@
}
}
if(userInfo.getState() == 2){
- return ResultUtil.error("账号被冻结");
+ return ResultUtil.error(language == 1 ? "账号被冻结" : language == 2 ? "Account is frozen" : "Le compte est gelé");
}
//调用单点登录的逻辑
@@ -454,10 +592,10 @@
return ResultUtil.error(language == 1 ? "账号无效" : language == 2 ? "Invalid account" : "Compte non valide");
}
if(userInfo.getState() == 2){
- return ResultUtil.error(language == 1 ? "账号被冻结" : language == 2 ? "Account is frozen." : "Le compte est gelé");
+ return ResultUtil.error(language == 1 ? "账号被冻结" : language == 2 ? "Account is frozen" : "Le compte est gelé");
}
if(!ShiroKit.md5(password, salt).equals(userInfo.getPassWord())){
- return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
}
//调用单点登录的逻辑
@@ -468,6 +606,7 @@
loginWarpper.setId(userInfo.getId());
loginWarpper.setToken(token);
loginWarpper.setAppid(UUIDUtil.getRandomCode());
+ loginWarpper.setEmail(userInfo.getEmail());
loginWarpper.setEmergencyContact(userInfo.getEmergencyContact());
loginWarpper.setEmergencyContactNumber(userInfo.getEmergencyContactNumber());
return ResultUtil.success(loginWarpper);
@@ -492,7 +631,7 @@
String phone=null;
if(type == 2){//小程序
if(ToolUtil.isEmpty(jscode)){
- return ResultUtil.error("微信登录请求失败，请重试");
+ return ResultUtil.error(language == 1 ? "微信登录请求失败，请重试" : language == 2 ? "WeChat login request failed, please try again." : "La demande de connexion WeChat a échoué, veuillez réessayer.");
}
Map<String, String> map = weChatUtil.code2Session(jscode);
openid = map.get("openid");
@@ -572,6 +711,48 @@
user_french.text("Bonjour " + userInfo.getNickName() + "，");
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie", document.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ String randomString = ToolUtil.getRandomString(10);
+ file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/registration_" + randomString + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ 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");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ }
+ emailService.insert(tEmail);
}
@@ -579,7 +760,7 @@
}
if(userInfo.getState() == 2){
- return ResultUtil.error("账号被冻结");
+ return ResultUtil.error(language == 1 ? "账号被冻结" : language == 2 ? "Account is frozen" : "Le compte est gelé");
}
//调用单点登录的逻辑
@@ -667,29 +848,71 @@
french_date.text("Cette promotion est valide du" + startTime + "au" + endTime);
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive", document.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ String randomString = ToolUtil.getRandomString(10);
+ file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/coupon_" + randomString + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ 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");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ }
+ emailService.insert(tEmail);
}
}
}
return ResultUtil.success(loginWarpper);
}
@Override
- public ResultUtil<LoginWarpper> wxIsLogin(String jscode) throws Exception {
+ public ResultUtil<LoginWarpper> wxIsLogin(Integer language, String jscode) throws Exception {
UserInfo userInfo = null;
String phone=null;
if(ToolUtil.isEmpty(jscode)){
- return ResultUtil.error("微信登录请求失败，请重试");
+ return ResultUtil.error(language == 1 ? "微信登录请求失败，请重试" : language == 2 ? "WeChat login request failed, please try again." : "La demande de connexion WeChat a échoué, veuillez réessayer.");
}
Map<String, String> map = weChatUtil.code2Session(jscode);
String openid = map.get("openid");
String unionid = map.get("unionid");
userInfo = userInfoMapper.queryByOpenid2(openid);
if(null==userInfo){
- return ResultUtil.getResult(2000,"微信登录请求失败，请重试");
+ return ResultUtil.getResult(2000,language == 1 ? "微信登录请求失败，请重试" : language == 2 ? "WeChat login request failed, please try again." : "La demande de connexion WeChat a échoué, veuillez réessayer.");
}
if(userInfo.getState() == 2){
- return ResultUtil.error("账号被冻结");
+ return ResultUtil.error(language == 1 ? "账号被冻结" : language == 2 ? "Account is frozen" : "Le compte est gelé");
}
//调用单点登录的逻辑
@@ -709,8 +932,13 @@
@Override
- public ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language) throws Exception {
- UserInfo userInfo = this.selectOne(new EntityWrapper<UserInfo>().eq("faceBookId", id).ne("flag", 3));
+ public ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language,int type) throws Exception {
+ UserInfo userInfo=null;
+ if(type==1){
+ userInfo = this.selectOne(new EntityWrapper<UserInfo>().eq("faceBookId", id).ne("flag", 3));
+ }else {
+ userInfo = this.selectOne(new EntityWrapper<UserInfo>().eq("twitterId", id).ne("flag", 3));
+ }
if(null == userInfo){
userInfo = new UserInfo();
userInfo.setEmail(email);
@@ -720,7 +948,11 @@
userInfo.setBalance(0D);
userInfo.setIntegral(0);
userInfo.setPassWord(ShiroKit.md5("", salt));
- userInfo.setFaceBookId(id);
+ if(type==1){
+ userInfo.setFaceBookId(id);
+ }else {
+ userInfo.setTwitterId(id);
+ }
userInfo.setState(1);
userInfo.setFlag(1);
userInfo.setInsertTime(new Date());
@@ -774,14 +1006,54 @@
user_french.text("Bonjour " + userInfo.getNickName() + "，");
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie", document.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ String randomString = ToolUtil.getRandomString(10);
+ file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/registration_" + randomString + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ 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");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ }
+ emailService.insert(tEmail);
}
-
-
this.addCoupon(userInfo, language);//添加优惠券
}
if(userInfo.getState() == 2){
- return ResultUtil.error("账号被冻结");
+ return ResultUtil.error(language == 1 ? "账号被冻结" : language == 2 ? "Account is frozen" : "Le compte est gelé");
}
//调用单点登录的逻辑
@@ -869,6 +1141,48 @@
french_date.text("Cette promotion est valide du" + startTime + "au" + endTime);
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive", document.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ String randomString = ToolUtil.getRandomString(10);
+ file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/coupon_" + randomString + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setType(1);
+ tEmail.setName( language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ 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");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ }
+ emailService.insert(tEmail);
}
}
}
@@ -887,14 +1201,14 @@
public ResultUtil forgetPassword(String phone, String code, String password, Integer language) throws Exception {
UserInfo userInfo = this.queryByPhone(phone);
if(null == userInfo){
- return ResultUtil.error(language == 1 ? "手机号码未注册" : language == 2 ? "Cell phone number is not registered" : "Numéro de téléphone portable non enregistré");
+ return ResultUtil.error(language == 1 ? "手机号码未注册" : language == 2 ? "Mobile phone number was not registered." : "Le numéro de téléphone portable n’a pas été enregistré.");
}
boolean b = this.checkCaptcha(phone, code);
if(!b){
b = this.checkCaptcha(userInfo.getEmail(), code);
}
if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
if(userInfo.getState() == 2){
return ResultUtil.error(language == 1 ? "账号已被冻结" : language == 2 ? "The account has been frozen" : "Le compte a été gelé");
@@ -921,7 +1235,7 @@
public ResultUtil bindingPhone(Integer uid, String phoneOperator, String phone, String code, Integer language) throws Exception {
boolean b = this.checkCaptcha(phone, code);
if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
UserInfo userInfo = this.selectById(uid);
UserInfo userInfo1 = userInfoMapper.queryByPhone(phone);
@@ -983,12 +1297,12 @@
public ResultUtil bindingEmail(Integer uid, Integer type, String email, String code, Integer language) throws Exception {
boolean b = this.checkCaptcha(email, code);
if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
UserInfo userInfo = this.selectById(uid);
UserInfo userInfo1 = userInfoMapper.queryByEmail(email);
if(null != userInfo1 && uid.compareTo(userInfo1.getId()) != 0){
- return ResultUtil.error(language == 1 ? "邮箱已被使用" : language == 2 ? "The mailbox is in use" : "La boîte mail a déjà été utilisée");
+ return ResultUtil.error(language == 1 ? "邮箱已被使用" : language == 2 ? "E-mail address is already in use." : "L’adresse e-mail est déjà utilisée.");
}
// if(null != userInfo1){
@@ -1077,8 +1391,11 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryUserInfo(Integer uid) throws Exception {
- return userInfoMapper.queryUserInfo(uid, null);
+ public Map<String, Object> queryUserInfo(Integer language, Integer uid) throws Exception {
+ Map<String, Object> map = userInfoMapper.queryUserInfo(uid, null);
+ String birthday = map.get("birthday").toString();
+ map.put("birthday", DateUtil.conversionFormat(language, birthday));
+ return map;
}
@@ -1089,8 +1406,11 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryUser(String phone) throws Exception {
- return userInfoMapper.queryUserInfo(null, phone);
+ public Map<String, Object> queryUser(Integer language, String phone) throws Exception {
+ Map<String, Object> map = userInfoMapper.queryUserInfo(null, phone);
+ String birthday = map.get("birthday").toString();
+ map.put("birthday", DateUtil.conversionFormat(language, birthday));
+ return map;
}
@@ -1119,7 +1439,7 @@
public ResultUtil depositBalance(Integer payType, String bankCardId, Double money, Integer uid, Integer type, Integer language) throws Exception {
UserInfo userInfo = userInfoMapper.selectById(uid);
if(money.compareTo(0D) <= 0){
- return ResultUtil.error("支付金额必须大于0元", "");
+ return ResultUtil.error(language == 1 ? "支付金额必须大于0元" : language == 2 ? "Payment amount must be greater than zero." : "Le montant du paiement doit être supérieur à zéro.", "");
}
if(payType == 1){//手机支付
Integer integer = paymentRecordService.saveData(2, uid, 1, null, null, 1, money, "", 1);//添加预支付数据
@@ -1178,12 +1498,12 @@
public ResultUtil updatePhone(String code, String phoneOperator, String phone, Integer uid, Integer language) throws Exception {
boolean b = this.checkCaptcha(phone, code);
if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
UserInfo userInfo = this.selectById(uid);
UserInfo userInfo1 = userInfoMapper.queryByPhone(phone);
if(null != userInfo1){
- return ResultUtil.error(language == 1 ? "手机号已被注册" : language == 2 ? "The phone number has been registered" : "Le numéro de téléphone a été enregistré");
+ return ResultUtil.error(language == 1 ? "手机号已被注册" : language == 2 ? "Mobile phone number has been registered." : "Le numéro de téléphone portable a été enregistré.");
}
userInfo.setPhoneOperator(phoneOperator);
userInfo.setPhone(phone);
@@ -1228,6 +1548,48 @@
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ String randomString = ToolUtil.getRandomString(10);
+ file = new File("/usr/local/nginx/html/files/html/password_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/password_" + randomString + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/password_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ 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");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ }
+ emailService.insert(tEmail);
}
return ResultUtil.success();
}
@@ -1260,7 +1622,7 @@
if(null != email){
String value = redisUtil.getValue(email);
if(ToolUtil.isEmpty(value) || code.equals(value)){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
userInfo.setEmail(email);
}
@@ -1326,7 +1688,7 @@
* @throws Exception
*/
public synchronized void addCoupon(Integer userId, Double money, Integer companyId, Integer paymentRecordId, Integer language) throws Exception{
- List<Map<String, Object>> query = userActivityBalanceService.query(money, companyId);
+ List<Map<String, Object>> query = userActivityBalanceService.query(language, money, companyId);
List<UserCouponRecord> list = new ArrayList<>();
for(Map<String, Object> map : query){
//添加通用优惠券
@@ -1494,6 +1856,48 @@
french_date.text("Cette promotion est valide du" + startTime + "au" + endTime);
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive", document.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ String randomString = ToolUtil.getRandomString(10);
+ file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/coupon_" + randomString + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(userInfo.getId());
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ 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");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ }
+ emailService.insert(tEmail);
}
}
}
@@ -1546,7 +1950,7 @@
*/
private synchronized void addCoupon(UserInfo userInfo, Integer language) throws Exception{
//添加优惠券
- List<Map<String, Object>> list = userActivityRegisteredService.query(userInfo.getCompanyId());
+ List<Map<String, Object>> list = userActivityRegisteredService.query(language, userInfo.getCompanyId());
int num = 0;
for(Map<String, Object> map : list){
if(null != map){
@@ -1619,6 +2023,47 @@
french_date.text("Cette promotion est valide du" + startTime + "au" + endTime);
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive", document.html());
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ String randomString = ToolUtil.getRandomString(10);
+ file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/coupon_" + randomString + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(userInfo.getId());
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(language==1?"上午":language==2?"Morning":"");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"Afternoon":"");
+ }
+ emailService.insert(tEmail);
}
}
}
@@ -1632,7 +2077,6 @@
* @param id
*/
private void singlePointLogin(Integer id) throws Exception{
- pushUtil.pushOffline(id, 1);
//开始验证当前账号是否在别处登录
String value = redisUtil.getValue("USER_" + id);
if(ToolUtil.isNotEmpty(value)){//将另外设备上的强迫下线
--
Gitblit v1.7.1