fix 小程序报名之后需要审核的报名成功的页面应该跳转到需要审核的页面

This commit is contained in:
lijiarao
2021-11-18 10:03:04 +08:00
parent e09dd05436
commit 5a919b5f9a
3 changed files with 7 additions and 7 deletions
@@ -149,8 +149,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
@ApiOperation(value = "报名信息-报名", notes = "报名信息-报名")
@PostMapping(value = "/signUp")
public Result<?> signUp(@RequestBody PayMeetingSituation payMeetingSituation) {
payMeetingSituationService.signUp(payMeetingSituation);
return Result.OK("添加成功!");
return Result.OK(payMeetingSituationService.signUp(payMeetingSituation));
}
@@ -54,7 +54,7 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
void addDock(AddDockVO addDockVO);
void signUp(PayMeetingSituation payMeetingSituation);
boolean signUp(PayMeetingSituation payMeetingSituation);
void check(CheckVO checkVO);
@@ -63,7 +63,6 @@ import com.jero.util.module.ObjRecordUtilModule;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -78,8 +77,6 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.transaction.annotation.Transactional;
import static org.apache.shiro.web.filter.mgt.DefaultFilter.user;
/**
* @Description: 会议报名信息
* @Author: jero-boot
@@ -270,9 +267,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
/**
* 报名
* @return
*/
@Override
public void signUp(PayMeetingSituation payMeetingSituation) {
public boolean signUp(PayMeetingSituation payMeetingSituation) {
payMeetingSituation.setStatus(MeetingSubitemCommon.STATUS_1);
String meetingId = payMeetingSituation.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
@@ -314,6 +312,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);
//上传付款凭证发送邮件提醒审批
//SendPaymentRecordMessage(payMeetingSituation1, payMeeting); 报名不上传付款凭证
//报名后返回是否不需要审核
return Objects.equals(payMeetingSituation.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)
&& Objects.equals(payMeetingSituation.getCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1);
}
/**