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

This commit is contained in:
lijiarao
2021-10-11 18:00:35 +08:00
parent 04e3b47361
commit 985128668f
3 changed files with 4 additions and 8 deletions
@@ -326,7 +326,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
*/
@ApiOperation(value = "获得签到页面")
@GetMapping(value = "/getSignInPage")
public Result<?> getSignInPage(@RequestBody SignInVO signInVO) {
public Result<?> getSignInPage(SignInVO signInVO) {
ValidUtil.validate(signInVO);
SignInPageVO signInPageVO = payMeetingSituationService.signIn(signInVO);
return Result.OK(signInPageVO);
@@ -555,13 +555,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (!belongCalendar(new Date(), payMeeting.getStartSignInTime(), payMeeting.getEndSignInTime())) {
throw new JeroBootException("不在会议可签到时间内,无法签到");
}
String companyContactId = signInVO.getCompanyContactId();
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
if (contactsManagement == null) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (loginUser == null) {
throw new JeroBootException("参会人不存在");
}
String companyContactId = loginUser.getId();
LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingSituation::getMeetingId, meetingId);
wrapper.eq(PayMeetingSituation::getCompanyContactId, companyContactId);
@@ -14,9 +14,6 @@ import javax.validation.constraints.NotBlank;
*/
@Data
public class SignInVO {
@NotBlank(message = "参会人id不能为空")
@ApiModelProperty(value = "参会人id")
private String companyContactId;
@ApiModelProperty(value = "会议id")
@NotBlank(message = "会议id不能为空")
private String meetingId;