fix bug 41414 报名信息审核不通过后,缴费凭证却审核通过成功了,请确认业务
This commit is contained in:
@@ -288,4 +288,7 @@ public class PayMeeting implements Serializable {
|
|||||||
*/
|
*/
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private Integer meetingSignUpType;
|
private Integer meetingSignUpType;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private Integer registerCheckResult;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -33,6 +33,7 @@
|
|||||||
<result column="remark" property="remark"/>
|
<result column="remark" property="remark"/>
|
||||||
<result column="pay_mode" property="payMode"/>
|
<result column="pay_mode" property="payMode"/>
|
||||||
<result column="meetingStatus" property="meetingStatus"/>
|
<result column="meetingStatus" property="meetingStatus"/>
|
||||||
|
<result column="register_check_result" property="registerCheckResult"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<!-- 将原有id改为会议id, 新增situationId 为成员id -->
|
<!-- 将原有id改为会议id, 新增situationId 为成员id -->
|
||||||
<select id="pageListContract" resultMap="PayMeetingResultMap">
|
<select id="pageListContract" resultMap="PayMeetingResultMap">
|
||||||
@@ -71,6 +72,7 @@
|
|||||||
case_committee_name,
|
case_committee_name,
|
||||||
notice,
|
notice,
|
||||||
pms.pay_mode,
|
pms.pay_mode,
|
||||||
|
pms.register_check_result,
|
||||||
pms.id as situationId,
|
pms.id as situationId,
|
||||||
pm.id,
|
pm.id,
|
||||||
(case
|
(case
|
||||||
|
|||||||
+3
@@ -710,6 +710,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
|||||||
if (!Objects.equals(payMeetingSituation1.getCompanyContactId(), loginUserId)) {
|
if (!Objects.equals(payMeetingSituation1.getCompanyContactId(), loginUserId)) {
|
||||||
throw new JeroBootException("不是参会人无法上传缴费凭证");
|
throw new JeroBootException("不是参会人无法上传缴费凭证");
|
||||||
}
|
}
|
||||||
|
if (!Objects.equals(payMeetingSituation1.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)) {
|
||||||
|
throw new JeroBootException("报名信息未审核通过,无法上传缴费凭证");
|
||||||
|
}
|
||||||
String paymentRecord = payMeetingSituationVO.getPaymentRecord();
|
String paymentRecord = payMeetingSituationVO.getPaymentRecord();
|
||||||
String orderCode = payMeetingSituationVO.getOrderCode();
|
String orderCode = payMeetingSituationVO.getOrderCode();
|
||||||
PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
|
PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
|
||||||
|
|||||||
Reference in New Issue
Block a user