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

update 小程序 签到和获取签到页面

Browse Source
This commit is contained in:
lijiarao
2021-10-12 10:26:14 +08:00
parent a65438d113
commit e1388434c0
2 changed files with 31 additions and 7 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
+26 -7
View File
@@ -551,11 +551,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (payMeeting == null) {
throw new JeroBootException("会议不存在");
}
Date startTime = payMeeting.getStartSignInTime() != null ? payMeeting.getStartSignInTime() : payMeeting.getStartTime();
/*Date startTime = payMeeting.getStartSignInTime() != null ? payMeeting.getStartSignInTime() : payMeeting.getStartTime();
Date endTime = payMeeting.getEndSignInTime() != null ? payMeeting.getEndSignInTime() : payMeeting.getEndTime();
if (!belongCalendar(new Date(), startTime, endTime)) {
throw new JeroBootException("不在会议可签到时间内,无法签到");
}
}*/
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (loginUser == null) {
throw new JeroBootException("参会人不存在");
@@ -569,17 +569,23 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (meetingSituation == null) {
throw new JeroBootException("很抱歉，未查询到您的报名信息");
}
//如果是线上缴费并且缴费凭证为空
Integer payMode = meetingSituation.getPayMode();
if (Objects.equals(payMode, 2) && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
throw new JeroBootException("请上传缴费凭证后再签到");
}
if (StringUtils.isNotBlank(signInVO.getFileId())) {
Integer checkIn = meetingSituation.getCheckIn();
if (checkIn.equals(PayProjectCommon.YES)) {
throw new JeroBootException("已经签到，请勿重复签到");
}
//如果是汇款并且缴费凭证为空
Integer payMode = meetingSituation.getPayMode();
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
&& StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
throw new JeroBootException("请上传缴费凭证后再签到");
}
//如果是线上缴费并且审核不通过的
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
throw new JeroBootException("请审核通过后再签到");
}
meetingSituation.setCheckIn(PayProjectCommon.YES);
meetingSituation.setCheckFile(signInVO.getFileId());
saveOrUpdate(meetingSituation);
@@ -601,6 +607,19 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
signInPageVO.setCompanyContactName(meetingSituation.getCompanyContactName());
signInPageVO.setCheckIn(meetingSituation.getCheckIn());
signInPageVO.setCheckFile(meetingSituation.getCheckFile());
//如果是汇款并且缴费凭证为空
Integer payMode = meetingSituation.getPayMode();
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
&& StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
signInPageVO.setCanCheckIn(0);
}
//如果是线上缴费并且审核不通过的
else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
signInPageVO.setCanCheckIn(0);
}else {
signInPageVO.setCanCheckIn(1);
}
return signInPageVO;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SignInPageVO.java
+5
View File
@@ -65,6 +65,11 @@ public class SignInPageVO {
@Dict(dicCode = "yn")
private Integer checkIn;
/**是否可以签到*/
@ApiModelProperty(value = "是否可以签到")
@Dict(dicCode = "yn")
private Integer canCheckIn;
/**签到文件*/
@ApiModelProperty(value = "签到文件")
private String checkFile;