diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index a98cdb76..dff2c1a2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -334,8 +334,7 @@ public class PayMeetingSituationController extends JeroController getSignInPage(SignInVO signInVO) { ValidUtil.validate(signInVO); - SignInPageVO signInPageVO = payMeetingSituationService.signIn(signInVO); - return Result.OK(signInPageVO); + return payMeetingSituationService.signIn(signInVO); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java index c394bb31..9a19adf1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java @@ -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 contractPage(Page page, MeetingSituationContractVO meetingSituationContractVO); - SignInPageVO signIn(SignInVO signInVO); + Result signIn(SignInVO signInVO); String getMeetingType(PayMeetingSituation payMeetingSituation); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index b545820d..2db19b91 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -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 signIn(SignInVO signInVO) { String meetingId = signInVO.getMeetingId(); PayMeeting payMeeting = meetingService.getById(meetingId); @@ -575,7 +575,18 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl 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