From 7a14e1592dd0c2cfd6cd4e8b11f95c9f46f2ffe7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 七月 2023 20:07:04 +0800
Subject: [PATCH] 修改支付相关逻辑代码
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 03c065d..a29af8f 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
@@ -1230,7 +1230,7 @@
* @throws Exception
*/
@Override
- public void updateInfo(String avatar, String nickname, Integer sex, Date birthday, String email, String lastName, String firstName, Integer uid) throws Exception {
+ public ResultUtil updateInfo(String avatar, String nickname, Integer sex, Date birthday, String email, String code, String lastName, String firstName, Integer uid, Integer language) throws Exception {
UserInfo userInfo = this.selectById(uid);
if(ToolUtil.isNotEmpty(avatar)){
userInfo.setAvatar(avatar);
@@ -1245,6 +1245,10 @@
userInfo.setBirthday(birthday);
}
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");
+ }
userInfo.setEmail(email);
}
if(null != lastName){
@@ -1254,6 +1258,7 @@
userInfo.setFirstName(firstName);
}
this.updateById(userInfo);
+ return ResultUtil.success();
}
@@ -1273,11 +1278,10 @@
* 完成余额充值后的处理
* @param id 用户id
* @param order_id 工行订单id
- * @param type 支付类型（1=微信，2=支付宝）
* @throws Exception
*/
@Override
- public void payCancelUserBalance(Integer id, String order_id, Integer paymentRecordId, Integer type, Integer language) throws Exception {
+ public void payCancelUserBalance(Integer id, String order_id, Integer paymentRecordId, Integer language) throws Exception {
PaymentRecord query = paymentRecordService.selectById(paymentRecordId);
UserInfo userInfo = this.selectById(query.getUserId());
if(null != query){
@@ -1294,7 +1298,7 @@
this.addCoupon(userInfo.getId(), query.getAmount(), userInfo.getCompanyId(), query.getId(), language);//添加优惠券
}else{
- System.err.println("预支付数据异常（userId = " + id + ")");
+ System.err.println("预支付数据异常（paymentRecordId = " + paymentRecordId + ")");
}
}
--
Gitblit v1.7.1