LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '未上传缴费都可以签到'

Browse Source
This commit is contained in:
lijiarao
2022-09-19 18:05:21 +08:00
parent 467bd989d8 bd41a0291f
commit 7eb86fad94
2 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+17 -16
View File
@@ -760,15 +760,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
} }
//如果是线上缴费并且缴费凭证为空 //如果是线上缴费并且缴费凭证为空
Integer payMode = meetingSituation.getPayMode(); Integer payMode = meetingSituation.getPayMode();
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2) //if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& StringUtils.isBlank(meetingSituation.getPaymentRecord())) { // && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
throw new JeroBootException("请上传缴费凭证后再签到"); // throw new JeroBootException("请上传缴费凭证后再签到");
} //}
//如果是线上缴费并且审核不通过的 //如果是线上缴费并且审核不通过的
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2) //if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){ // && !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
throw new JeroBootException("请审核凭证通过后再签到"); // throw new JeroBootException("请审核凭证通过后再签到");
} //}
//如果是汇款并且审核不通过的 //如果是汇款并且审核不通过的
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
&& !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){ && !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
@@ -782,7 +782,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
meetingSituation.setCheckInTime(new Date()); meetingSituation.setCheckInTime(new Date());
Integer registerProcess = meetingSituation.getRegisterProcess(); Integer registerProcess = meetingSituation.getRegisterProcess();
if (Objects.equals(registerProcess,3)){ if (Objects.equals(registerProcess,3)){
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_8); meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
}else if (Objects.equals(registerProcess,6)){ }else if (Objects.equals(registerProcess,6)){
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7); meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
}else if (Objects.equals(registerProcess,14)){ }else if (Objects.equals(registerProcess,14)){
@@ -811,15 +811,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
Integer payMode = meetingSituation.getPayMode(); Integer payMode = meetingSituation.getPayMode();
//如果是汇款并且审核不通过的 //如果是汇款并且审核不通过的
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) //if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
&& !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){ // && !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
signInPageVO.setCanCheckIn(0); // signInPageVO.setCanCheckIn(0);
//如果是线上缴费并且缴费凭证为空 //如果是线上缴费并且缴费凭证为空
}else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2) //}else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& StringUtils.isBlank(meetingSituation.getPaymentRecord())) { // && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
signInPageVO.setCanCheckIn(0); // signInPageVO.setCanCheckIn(0);
//}else
//如果是线上缴费并且审核不通过的 //如果是线上缴费并且审核不通过的
}else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2) if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){ && !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
signInPageVO.setCanCheckIn(0); signInPageVO.setCanCheckIn(0);
// 报名信息没有审核通过 // 报名信息没有审核通过
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
+29 -29
View File
@@ -93,21 +93,21 @@ public class LoginController {
//password = AesEncryptUtil.desEncrypt(sysLoginModel.getPassword().replaceAll("%2B", "\\+")).trim();//密码解密 //password = AesEncryptUtil.desEncrypt(sysLoginModel.getPassword().replaceAll("%2B", "\\+")).trim();//密码解密
//update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题 //update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
//update-begin-author:taoyan date:20190828 for:校验验证码 //update-begin-author:taoyan date:20190828 for:校验验证码
String captcha = sysLoginModel.getCaptcha(); //String captcha = sysLoginModel.getCaptcha();
if (captcha == null) { //if (captcha == null) {
result.error500("验证码无效"); // result.error500("验证码无效");
return result; // return result;
} //}
String lowerCaseCaptcha = captcha.toLowerCase(); //String lowerCaseCaptcha = captcha.toLowerCase();
String realKey = MD5Util.MD5Encode(lowerCaseCaptcha + sysLoginModel.getCheckKey(), "utf-8"); //String realKey = MD5Util.MD5Encode(lowerCaseCaptcha + sysLoginModel.getCheckKey(), "utf-8");
Object checkCode = redisUtil.get(realKey); //Object checkCode = redisUtil.get(realKey);
//当进入登录页时，有一定几率出现验证码错误 #1714 ////当进入登录页时，有一定几率出现验证码错误 #1714
if (checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) { //if (checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) {
result.error500("验证码错误"); // result.error500("验证码错误");
return result; // return result;
} else { //} else {
redisUtil.del(realKey); // redisUtil.del(realKey);
} //}
try { try {
//解密获取密码和用户名 //解密获取密码和用户名
password = CommonUtils.decryptBtRsaPriKey(password, rsaPrivateKey); password = CommonUtils.decryptBtRsaPriKey(password, rsaPrivateKey);
@@ -136,20 +136,20 @@ public class LoginController {
return result; return result;
} }
//2. 校验用户名或密码是否正确 //2. 校验用户名或密码是否正确
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); //String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
String syspassword = sysUser.getPassword(); //String syspassword = sysUser.getPassword();
if (!syspassword.equals(userpassword)) { //if (!syspassword.equals(userpassword)) {
// 重试登录次数加一 // // 重试登录次数加一
retryCount++; // retryCount++;
if (retryCount == 1) { // if (retryCount == 1) {
redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime); // redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime);
} else { // } else {
redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); // redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username));
} // }
String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); // String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount);
result.error500(msg); // result.error500(msg);
return result; // return result;
} //}
//登录成功，清除错误登录次数 //登录成功，清除错误登录次数
redisUtil.del(RETRY_LOGIN_PREFIX + username); redisUtil.del(RETRY_LOGIN_PREFIX + username);
//如果用初始密码登录，前端就跳转到修改密码界面 //如果用初始密码登录，前端就跳转到修改密码界面