From cf71570fb38ad1983cd40e65fb09e259e509d2a3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 06 五月 2024 09:36:45 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 225 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 153 insertions(+), 72 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
index 53453fa..436ecf1 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -13,7 +13,11 @@
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
+import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
import com.stylefeng.guns.modular.system.warpper.*;
+import com.stylefeng.guns.modular.taxi.model.TransactionDetails;
+import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
+import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -21,6 +25,7 @@
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
@@ -34,6 +39,7 @@
import javax.servlet.http.HttpSession;
import java.io.*;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -71,6 +77,10 @@
@Autowired
private TEmailService emailService;
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
+ @Autowired
+ private IPaymentRecordService paymentRecordService;
@@ -116,8 +126,6 @@
}
}
-
-
/**
* 获取短信验证码
* @param phone
@@ -129,7 +137,8 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "手机号码", name = "phone", required = true, dataType = "String"),
@ApiImplicitParam(value = "图片验证码", name = "kaptcha", required = true, dataType = "String"),
- @ApiImplicitParam(value = "场景类型（1=身份验证，2=登录确认，3=用户注册，4=修改密码）", name = "type", required = true, dataType = "String")
+ @ApiImplicitParam(value = "场景类型（1=身份验证，2=登录确认，3=用户注册，4=修改密码）", name = "type", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int")
})
public ResultUtil queryCaptcha(HttpServletRequest request,String phone, Integer type,String kaptcha, Integer language){
if(ToolUtil.isNotEmpty(phone)){
@@ -146,7 +155,7 @@
String code = redisUtil.getValue(phone+"_Code");
System.out.println("缓存中验证码为："+code);
if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) {
- return ResultUtil.error(language == 1 ? "图形验证码错误" : language == 2 ? "The graphic verification code is incorrect" : "Code de vérification graphique incorrect");
+ return ResultUtil.error(language == 1 ? "图形验证码错误" : language == 2 ? "Wrong CAPTCHA" : "CAPTCHA erroné");
}
return userInfoService.queryCaptcha(phone, type, language);
}catch (Exception e){
@@ -157,8 +166,6 @@
return ResultUtil.paranErr();
}
}
-
-
@ResponseBody
@PostMapping("/base/queryCaptcha1")
@@ -187,10 +194,6 @@
}
}
-
-
-
-
@ResponseBody
@PostMapping("/base/sedEmail")
@ApiOperation(value = "获取邮箱验证码【1.0】", tags = {"用户端-登录"}, notes = "")
@@ -199,22 +202,33 @@
})
public ResultUtil sedEmail(String email, Integer language, HttpServletRequest request){
try {
+
Integer uid = userInfoService.getUserIdFormRedis(request);
+
if(ToolUtil.isEmpty(email)){
- return ResultUtil.error(language == 1 ? "邮箱不能为空" : language == 2 ? "The mailbox cannot be empty" : "L’email ne peut pas être vide");
+ return ResultUtil.error(language == 1 ? "邮箱不能为空" : language == 2 ? "E-mail address cannot be empty." : "L’adresse e-mail ne peut pas être vide.");
}
+
Random random = new Random();
+
StringBuffer sb = new StringBuffer();
+
for(int i = 0; i < 4; i++){
sb.append((int) (random.nextDouble() * 10));
}
+
String authCode = sb.toString();
+
redisUtil.setStrValue(email, authCode, 5 * 60);
UserInfo userInfo = userInfoService.selectById(uid);
+
String nickName = "";
+
if(null != userInfo){
+
nickName = userInfo.getNickName();
+
}
if(ToolUtil.isNotEmpty(email)){
@@ -223,6 +237,7 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("邮箱验证");
Element user_chinese = document.getElementById("user_chinese");
user_chinese.text("您好 " + nickName + "，");
Element content_chinese = document.getElementById("content_chinese");
@@ -231,20 +246,54 @@
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Verification code");
Element user_chinese = document.getElementById("user_english");
user_chinese.text("Hello " + nickName + "，");
- Element content_chinese = document.getElementById("content_english");
- content_chinese.text(authCode);
+ Element content_english = document.getElementById("content_english");
+ content_english.text(authCode);
}
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Code de validation");
Element user_french = document.getElementById("user_french");
user_french.text("Bonjour " + nickName + "，");
Element content_french = document.getElementById("content_french");
content_french.text(authCode);
}
- EmailUtil.send(email, language == 1 ? "验证码" : language == 2 ? "Verification code" : "Code de vérification", document.html());
+ EmailUtil.send(email, language == 1 ? "邮箱验证" : language == 2 ? "Verification code" : "Code de validation", 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/mainbox_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/mainbox_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "邮箱验证" : language == 2 ? "Verification code" : "Code de validation");
+ 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?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
}
return ResultUtil.success();
}catch (Exception e){
@@ -252,9 +301,6 @@
return ResultUtil.runErr();
}
}
-
-
-
/**
* 手机验证码登录
@@ -304,8 +350,6 @@
}
}
-
-
/**
* 手机验证码登录
* @param phone
@@ -321,7 +365,8 @@
@ApiImplicitParam(value = "短信验证码", name = "code", required = true, dataType = "String"),
@ApiImplicitParam(value = "分享的用户id", name = "uid", required = true, dataType = "int"),
@ApiImplicitParam(value = "用户类型（1=用户，2=司机）", name = "type", required = true, dataType = "int"),
- @ApiImplicitParam(value = "注册类型（1=司机注册，2=用户注册）", name = "userType", required = true, dataType = "int")
+ @ApiImplicitParam(value = "注册类型（1=司机注册，2=用户注册）", name = "userType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int")
})
public ResultUtil<LoginWarpper> captchaLogin_(String phoneOperator, String phone, String code, Integer uid, Integer type, Integer userType, Integer language){
try {
@@ -352,10 +397,6 @@
return ResultUtil.runErr();
}
}
-
-
-
-
/**
* 账号密码登录
@@ -389,7 +430,6 @@
return ResultUtil.paranErr();
}
}
-
/**
* 忘记密码
@@ -425,7 +465,6 @@
return ResultUtil.paranErr();
}
}
-
/**
* 微信授权登录
@@ -471,15 +510,14 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "微信jscode（小程序登录上传）", name = "jscode", required = false, dataType = "String")
})
- public ResultUtil<LoginWarpper> wxIsLogin( String jscode){
+ public ResultUtil<LoginWarpper> wxIsLogin(Integer language, String jscode){
try {
- return userInfoService.wxIsLogin(jscode);
+ return userInfoService.wxIsLogin(language, jscode);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
@ResponseBody
@PostMapping("/base/user/facebookLogin")
@@ -496,15 +534,33 @@
})
public ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language){
try {
- return userInfoService.facebookLogin(id, name, email, lat, lng, uid, language);
+ return userInfoService.facebookLogin(id, name, email, lat, lng, uid, language,1);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
-
+ @ResponseBody
+ @PostMapping("/base/user/twitterLogin")
+ @ApiOperation(value = "twitter授权登录【1.0】", tags = {"用户端-登录"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "twitter用户id", name = "id", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "twitter用户名称", name = "name", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "twitter绑定的email", name = "email", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "头像", name = "avatar", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "性别(1=男，2=女)", name = "sex", required = false, dataType = "int"),
+ @ApiImplicitParam(value = "纬度", name = "lat", required = false, dataType = "double"),
+ @ApiImplicitParam(value = "经度", name = "lng", required = false, dataType = "double"),
+ @ApiImplicitParam(value = "分享的用户id", name = "uid", required = false, dataType = "int"),
+ })
+ public ResultUtil twitterLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language){
+ try {
+ return userInfoService.facebookLogin(id, name, email, lat, lng, uid, language,2);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
/**
* 设置电话号码
@@ -556,7 +612,6 @@
}
}
-
@ResponseBody
@PostMapping("/api/user/bindingEmail")
@ApiOperation(value = "设置邮箱地址【1.0】", tags = {"用户端-登录"}, notes = "")
@@ -585,21 +640,29 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<?> getEmailList(HttpServletRequest request){
+ public ResultUtil<List<EmailWarpper>> getEmailList(Integer language, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(emailService.selectList(new EntityWrapper<TEmail>().eq("userId",uid).eq("type",1)));
+ List<TEmail> tEmails = emailService.selectList(new EntityWrapper<TEmail>().eq("userId", uid).eq("type", 1).orderBy("createTime", false));
+ List<EmailWarpper> list = new ArrayList<>();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ for (TEmail tEmail : tEmails) {
+ EmailWarpper warpper = new EmailWarpper();
+ BeanUtils.copyProperties(tEmail, warpper);
+ warpper.setCreateTime(DateUtil.conversionFormat(language, sdf.format(tEmail.getCreateTime())));
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(tEmail.getCreateTime())-1;
+ warpper.setWeek(EmailUtil.getWeek(language,i));
+ list.add(warpper);
+ }
+ return ResultUtil.success(list);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
-
/**
* 获取用户个人信息
@@ -612,20 +675,19 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<UserInfoWarpper> queryUserInfo(HttpServletRequest request){
+ public ResultUtil<UserInfoWarpper> queryUserInfo(Integer language, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- Map<String, Object> map = userInfoService.queryUserInfo(uid);
+ Map<String, Object> map = userInfoService.queryUserInfo(language, uid);
return ResultUtil.success(UserInfoWarpper.getUserInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
/**
* 手机号码获取用户
@@ -639,7 +701,7 @@
@ApiImplicitParam(value = "电话号码", name = "phone", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<Object> queryUser(String phone){
+ public ResultUtil<Object> queryUser(Integer language, String phone){
try {
String substring = phone.substring(0, 1);
if("0".equals(substring)){
@@ -648,7 +710,7 @@
if(phone.indexOf("233") < 0){
phone = "233" + phone;
}
- Map<String, Object> map = userInfoService.queryUser(phone);
+ Map<String, Object> map = userInfoService.queryUser(language, phone);
if(null != map){
return ResultUtil.success(UserInfoWarpper.getUserInfoWarpper(map));
}
@@ -658,7 +720,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 实名认证操作
@@ -684,7 +745,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 设置紧急联系人
@@ -722,7 +782,6 @@
}
}
-
/**
* 用户充值余额
* @param payType
@@ -752,7 +811,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 修改手机号码
@@ -826,7 +884,6 @@
phone = "233" + phone;
}
UserInfo userInfo = userInfoService.selectById(uid);
- smsrecordService.saveData(4, userInfo.getPhone(), code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
boolean b = userInfoService.checkCaptcha(phone, code);
Map<String, Object> map = new HashMap<>();
map.put("ok", b ? 1 : 0);
@@ -836,8 +893,6 @@
return ResultUtil.runErr();
}
}
-
-
/**
* 修改登录密码
@@ -850,6 +905,7 @@
@ApiOperation(value = "修改登录密码", tags = {"用户端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "新密码", name = "password", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil updatePassword(String password, Integer language, HttpServletRequest request){
@@ -864,7 +920,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 修改个人信息
@@ -902,7 +957,6 @@
}
}
-
@ResponseBody
@PostMapping("/api/user/queryRealName")
@ApiOperation(value = "获取实名认证的数据", tags = {"用户端-个人中心"}, notes = "")
@@ -923,7 +977,6 @@
}
}
-
/**
* 后台调用禁用用户
* @param uid
@@ -943,7 +996,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 仿socket接口（单点登录）
@@ -1033,8 +1085,6 @@
}
}
-
-
@ResponseBody
@PostMapping("/api/user/editLanguage")
@ApiOperation(value = "修改多语言配置", tags = {"用户端-个人中心"}, notes = "")
@@ -1058,7 +1108,6 @@
}
}
-
@ResponseBody
@PostMapping("/base/user/addReportLoss")
@ApiOperation(value = "提交报失", tags = {"用户端-个人中心"}, notes = "")
@@ -1067,18 +1116,17 @@
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
@ApiImplicitParam(value = "提交内容", name = "remark", required = true, dataType = "int"),
@ApiImplicitParam(value = "提交图片", name = "image", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "1=中文，2=英文，3=法语", name = "language", required = true, dataType = "int"),
})
- public ResultUtil addReportLoss(Integer orderType, Integer orderId, String remark, String image){
+ public ResultUtil addReportLoss(Integer orderType, Integer orderId, String remark, String image, Integer language){
try {
- reportLossService.addReportLoss(orderType, orderId, remark, image);
+ reportLossService.addReportLoss(orderType, orderId, remark, image, language);
return ResultUtil.success();
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
@ResponseBody
@PostMapping("/base/user/queryOrderLicensePlate")
@@ -1097,8 +1145,6 @@
}
}
-
-
@ResponseBody
@RequestMapping("/base/user/image")
public String image(@RequestPart("file") MultipartFile file) {
@@ -1109,8 +1155,6 @@
return null;
}
}
-
-
@ResponseBody
@PostMapping("/api/user/queryBankCardList")
@@ -1140,8 +1184,6 @@
}
}
-
-
@ResponseBody
@PostMapping("/api/user/addBankCard")
@ApiOperation(value = "添加银行卡【1.1】", tags = {"用户端-个人中心"}, notes = "")
@@ -1162,11 +1204,11 @@
BigDecimal bigDecimal = new BigDecimal(code);
long max = Long.MAX_VALUE;
if(bigDecimal.compareTo(new BigDecimal(max)) >= 0){
- return ResultUtil.error(language == 1 ? "银行卡号格式错误" : language == 2 ? "The format of bank card number is incorrect" : "Format incorrect du numéro de carte bancaire");
+ return ResultUtil.error(language == 1 ? "银行卡号格式错误" : language == 2 ? "Format error of bank card" : "Erreur de format de la carte bancaire");
}
BankCard bankCard = bankCardService.selectOne(new EntityWrapper<BankCard>().eq("code", code));
if(null != bankCard){
- return ResultUtil.error(language == 1 ? "银行卡重复" : language == 2 ? "Duplicate bank card" : "Double carte bancaire");
+ return ResultUtil.error(language == 1 ? "银行卡重复" : language == 2 ? "Reduplication of bank card" : "Reduplication de la carte bancaire");
}
bankCard = new BankCard();
bankCard.setUserId(uid);
@@ -1183,8 +1225,6 @@
return ResultUtil.runErr();
}
}
-
-
@ResponseBody
@PostMapping("/api/user/delBankCard")
@@ -1203,6 +1243,47 @@
}
}
+ /**
+ * 用户查询充值记录
+ * @param request
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/api/user/queryRechargeRecord")
+ @ApiOperation(value = "用户查询充值记录", tags = {"用户端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil queryRechargeRecord(Integer pageNum, Integer size,Integer language,HttpServletRequest request){
+ try {
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ RechargeRecordWarpper rechargeRecordWarpper = new RechargeRecordWarpper();
+ List<Map<String,Object>> paymentRecord = paymentRecordService.queryRechargeRecord(uid, pageNum, size);
+ for (Map<String, Object> map : paymentRecord) {
+ if(null != map.get("insertTime")){
+ String time = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, time));
+ }
+ }
+ // 分装返回充值记录实体
+ List<TransactionDetailsWarpper> transactionDetailsWarpper = TransactionDetailsWarpper.getTransactionDetailsWarpper(paymentRecord);
+
+ // 查询充值金额总和
+ double sum = paymentRecordService.queryRechargeMoneySum(uid);
+ rechargeRecordWarpper.setSum(sum);
+ rechargeRecordWarpper.setTransactionDetailsWarpper(transactionDetailsWarpper);
+ return ResultUtil.success(rechargeRecordWarpper);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
/**
* 下载pdf
--
Gitblit v1.7.1