From c91d30ae503c1a37c60a2fc83f610e032d56a26c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 25 七月 2023 09:49:58 +0800
Subject: [PATCH] 更新短信模板
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 125 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 109 insertions(+), 16 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 0e672e2..53c205f 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
@@ -1,21 +1,18 @@
package com.stylefeng.guns.modular.api;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.BigDecimalCodec;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.google.code.kaptcha.Constants;
import com.stylefeng.guns.core.common.constant.JwtConstants;
import com.stylefeng.guns.core.common.exception.InvalidKaptchaException;
import com.stylefeng.guns.core.support.HttpKit;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.BankCard;
import com.stylefeng.guns.modular.system.model.UserInfo;
-import com.stylefeng.guns.modular.system.service.IReportLossService;
-import com.stylefeng.guns.modular.system.service.ISmsrecordService;
-import com.stylefeng.guns.modular.system.service.IUserInfoService;
-import com.stylefeng.guns.modular.system.service.IVerifiedService;
+import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
-import com.stylefeng.guns.modular.system.warpper.LoginWarpper;
-import com.stylefeng.guns.modular.system.warpper.UserInfoWarpper;
-import com.stylefeng.guns.modular.system.warpper.UserInviteInfoWarpper;
-import com.stylefeng.guns.modular.system.warpper.VerifiedWarpper;
+import com.stylefeng.guns.modular.system.warpper.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -30,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.io.File;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -55,6 +53,9 @@
@Autowired
private IReportLossService reportLossService;
+
+ @Autowired
+ private IBankCardService bankCardService;
@Value("${spring.mail.template-path}")
private String templatePath;
@@ -135,7 +136,7 @@
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 userInfoService.queryCaptcha(phone, type);
+ return userInfoService.queryCaptcha(phone, type, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -154,7 +155,7 @@
@ApiImplicitParam(value = "手机号码", name = "phone", required = true, dataType = "String"),
@ApiImplicitParam(value = "场景类型（1=身份验证，2=登录确认，3=用户注册，4=修改密码）", name = "type", required = true, dataType = "String")
})
- public ResultUtil queryCaptcha1(String phone, Integer type){
+ public ResultUtil queryCaptcha1(String phone, Integer type, Integer language){
if(ToolUtil.isNotEmpty(phone)){
try {
String substring = phone.substring(0, 1);
@@ -164,7 +165,7 @@
if(phone.indexOf("233") < 0){
phone = "233" + phone;
}
- return userInfoService.queryCaptcha(phone, type);
+ return userInfoService.queryCaptcha(phone, type, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -533,7 +534,7 @@
*/
@ResponseBody
@PostMapping("/api/user/queryUserInfo")
- @ApiOperation(value = "获取用户详情【1.0】", tags = {"用户端-个人中心"}, notes = "")
+ @ApiOperation(value = "获取用户详情【1.1】", tags = {"用户端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -788,25 +789,25 @@
*/
@ResponseBody
@PostMapping("/api/user/updateInfo")
- @ApiOperation(value = "修改个人信息", tags = {"用户端-个人中心"}, notes = "")
+ @ApiOperation(value = "修改个人信息【1.1】", tags = {"用户端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "头像", name = "avatar", required = false, dataType = "string"),
@ApiImplicitParam(value = "昵称", name = "nickname", required = false, dataType = "string"),
@ApiImplicitParam(value = "性别（1=男，2=女）", name = "sex", required = false, dataType = "int"),
@ApiImplicitParam(value = "生日（2020-06-15）", name = "birthday", required = false, dataType = "string"),
@ApiImplicitParam(value = "邮箱", name = "email", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "邮箱验证码", name = "code", required = false, dataType = "string"),
@ApiImplicitParam(value = "姓氏", name = "lastName", required = false, dataType = "string"),
@ApiImplicitParam(value = "名字", name = "firstName", required = false, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil updateInfo(String avatar, String nickname, Integer sex, Date birthday, String email, String lastName, String firstName, HttpServletRequest request){
+ public ResultUtil updateInfo(String avatar, String nickname, Integer sex, Date birthday, String email, String code, String lastName, String firstName, Integer language, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- userInfoService.updateInfo(avatar, nickname, sex, birthday, email, lastName, firstName, uid);
- return ResultUtil.success();
+ return userInfoService.updateInfo(avatar, nickname, sex, birthday, email, code, lastName, firstName, uid, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -988,4 +989,96 @@
return ResultUtil.runErr();
}
}
+
+
+ @ResponseBody
+ @PostMapping("/api/user/queryBankCardList")
+ @ApiOperation(value = "获取银行卡列表【1.1】", tags = {"用户端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<BankCardWarpper>> queryBankCardList(HttpServletRequest request){
+ try {
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ List<BankCard> bankCards = bankCardService.selectList(new EntityWrapper<BankCard>().eq("userType", 1).eq("userId", uid));
+ List<BankCardWarpper> list = new ArrayList<>();
+ for (BankCard bankCard : bankCards) {
+ BankCardWarpper bankCardWarpper = new BankCardWarpper();
+ bankCardWarpper.setId(bankCard.getId());
+ bankCardWarpper.setBankName(bankCard.getBank());
+ bankCardWarpper.setCode(bankCard.getCode());
+ list.add(bankCardWarpper);
+ }
+ return ResultUtil.success(list);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/user/addBankCard")
+ @ApiOperation(value = "添加银行卡【1.1】", tags = {"用户端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "银行", name = "bank", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "姓", name = "lastName", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "名", name = "firstName", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "卡号", name = "code", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "1=中文，2=英文，3=法语", name = "language", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil addBankCard(String bank, String lastName, String firstName, String code, Integer language, HttpServletRequest request) {
+ try {
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ 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");
+ }
+ 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");
+ }
+ bankCard = new BankCard();
+ bankCard.setUserId(uid);
+ bankCard.setUserType(1);
+ bankCard.setCode(code);
+ bankCard.setBank(bank);
+ bankCard.setFirstName(firstName);
+ bankCard.setLastName(lastName);
+ bankCard.setInsertTime(new Date());
+ bankCardService.insert(bankCard);
+ return ResultUtil.success();
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/user/delBankCard")
+ @ApiOperation(value = "删除银行卡【1.1】", tags = {"用户端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "银行卡id", name = "id", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil delBankCard(Integer id){
+ try {
+ bankCardService.deleteById(id);
+ return ResultUtil.success();
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
}
--
Gitblit v1.7.1