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-19 14:16:08 +08:00
parent c38bc07eda
commit 9bed1cac68
3 changed files with 23 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/controller/PayMeetingSituationController.java
+1 -2
View File
@@ -334,8 +334,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
@GetMapping(value = "/getSignInPage")
public Result<SignInPageVO> getSignInPage(SignInVO signInVO) {
ValidUtil.validate(signInVO);
SignInPageVO signInPageVO = payMeetingSituationService.signIn(signInVO);
return Result.OK(signInPageVO);
return payMeetingSituationService.signIn(signInVO);
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
+2 -1
View File
@@ -3,6 +3,7 @@ package com.jero.meeting.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.meeting.entity.PayMeetingSituation;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.meeting.vo.*;
@@ -61,7 +62,7 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
Page<MeetingSituationContractVO> contractPage(Page<MeetingSituationContractVO> page, MeetingSituationContractVO meetingSituationContractVO);
SignInPageVO signIn(SignInVO signInVO);
Result<SignInPageVO> signIn(SignInVO signInVO);
String getMeetingType(PayMeetingSituation payMeetingSituation);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+20 -4
View File
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.common.ProjectCommon;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
@@ -61,7 +62,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.DateFormat;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -552,7 +552,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
@Override
public SignInPageVO signIn(SignInVO signInVO) {
public Result<SignInPageVO> signIn(SignInVO signInVO) {
String meetingId = signInVO.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
@@ -575,7 +575,18 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
wrapper.eq(PayMeetingSituation::getCompanyContactId, companyContactId);
PayMeetingSituation meetingSituation = getOne(wrapper);
if (meetingSituation == null) {
throw new JeroBootException("很抱歉，未查询到您的报名信息");
Result<SignInPageVO> result = new Result<>();
result.setMessage("很抱歉，未查询到您的报名信息");
result.setSuccess(false);
SignInPageVO signInPageVO = new SignInPageVO();
signInPageVO.setMeetingId(payMeeting.getId());
signInPageVO.setMeetingName(payMeeting.getMeetingName());
signInPageVO.setMeetingType(payMeeting.getMeetingType());
signInPageVO.setTbMeetingType(payMeeting.getTbMeetingType());
signInPageVO.setStartTime(payMeeting.getStartTime());
signInPageVO.setEndTime(payMeeting.getEndTime());
result.setResult(signInPageVO);
return result;
}
if (StringUtils.isNotBlank(signInVO.getFileId())) {
@@ -599,7 +610,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
meetingSituation.setCheckInTime(new Date());
saveOrUpdate(meetingSituation);
}
return putDate(payMeeting, meetingSituation);
SignInPageVO signInPageVO = putDate(payMeeting, meetingSituation);
return Result.OK(signInPageVO);
}
private SignInPageVO putDate(PayMeeting payMeeting, PayMeetingSituation meetingSituation) {
@@ -660,6 +672,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation.setOrderCode(orderCode);
updateById(payMeetingSituation);
PayMeetingSituation payMeetingSituation1 = getById(id);
String meetingId = payMeetingSituation1.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
}
@Override