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

fix:注册

Browse Source
This commit is contained in:
zhangqinlin
2021-12-17 15:26:28 +08:00
parent e609a57af9
commit 736dfdf2a4
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java
+1
View File
@@ -99,6 +99,7 @@ public class PayCaseCommitteeServiceImpl extends ServiceImpl<PayCaseCommitteeMap
String salt = oConvertUtils.randomGen(8); String salt = oConvertUtils.randomGen(8);
String passwordEncode = PasswordUtil.encrypt(phone,password,salt); String passwordEncode = PasswordUtil.encrypt(phone,password,salt);
registerSelf.getPayContactsManagement().setPassword(passwordEncode); registerSelf.getPayContactsManagement().setPassword(passwordEncode);
registerSelf.getPayContactsManagement().setSalt(salt);
payContactsManagementService.addMeeting(registerSelf.getPayContactsManagement()); payContactsManagementService.addMeeting(registerSelf.getPayContactsManagement());
redisUtil.del("_verification:_phone:" + phone); redisUtil.del("_verification:_phone:" + phone);
} }
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+3 -3
View File
@@ -459,7 +459,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
} }
String meetingMinute = byId.getMeetingMinute(); String meetingMinute = byId.getMeetingMinute();
String meetingData = byId.getMeetingData(); String meetingData = byId.getMeetingData();
List<String> fileList = null; List<String> fileList = new ArrayList<>();
if(StringUtils.isNotBlank(meetingMinute)) { if(StringUtils.isNotBlank(meetingMinute)) {
fileList.addAll(Arrays.asList(meetingMinute.split(","))); fileList.addAll(Arrays.asList(meetingMinute.split(",")));
} }
@@ -471,13 +471,13 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
} }
BigDecimal meetingCosts = byId.getMeetingCosts(); BigDecimal meetingCosts = byId.getMeetingCosts();
//免费会议 //免费会议
if ("0".equals(meetingCosts.toString())){ if (!"0.00".equals(meetingCosts.toString())){
QueryWrapper<PayMeetingSituation> queryWrapper1 = new QueryWrapper<>(); QueryWrapper<PayMeetingSituation> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("meeting_id", meetingId); queryWrapper1.eq("meeting_id", meetingId);
queryWrapper1.eq("company_contact_id", sysUserId); queryWrapper1.eq("company_contact_id", sysUserId);
PayMeetingSituation one = payMeetingSituationService.getOne(queryWrapper1); PayMeetingSituation one = payMeetingSituationService.getOne(queryWrapper1);
if (ObjectUtils.isEmpty(one)) { if (ObjectUtils.isEmpty(one)) {
throw new JeroBootException("会议报名并审核通过后才可查看文件"); throw new JeroBootException("未报名会议。");
} }
Integer checkResult = one.getCheckResult(); Integer checkResult = one.getCheckResult();
if (checkResult != 1) { if (checkResult != 1) {