LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 新增15种报名流程

Browse Source
This commit is contained in:
lijiarao
2021-12-14 16:52:56 +08:00
parent 7b84176415
commit 1a491c77da
16 changed files with 157 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/12月8日需求变更新增.sql
+4 -1
View File
@@ -13,4 +13,7 @@ VALUES ('1470241235099570177', '1432944556812075009', '信息交流会', '3', ''
UPDATE sys_dict_item SET dict_id='1465203901006192642', item_text='报名信息待审核', item_value='1', description='', sort_order=1, status=1, create_by='LKGLZ', create_time='2021-11-29 14:20:51', update_by='LKGLZ', update_time='2021-12-14 11:53:52' WHERE id='1465204088109899777';
UPDATE sys_dict_item SET dict_id='1465203901006192642', item_text='凭证待审核', item_value='2', description='', sort_order=2, status=1, create_by='LKGLZ', create_time='2021-11-2914:48:51', update_by='LKGLZ', update_time='2021-12-14 11:58:34' WHERE id='1465211133961805825';
UPDATE sys_dict_item SET dict_id='1465203901006192642', item_text='待签到', item_value='6', description='', sort_order=6, status=1, create_by='LKGLZ', create_time='2021-11-2914:21:59', update_by='LKGLZ', update_time='2021-12-14 11:59:49' WHERE id='1465204373351931906';
INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1470604504423297026', '1465203901006192642', '已签到', '7', '', 7, 1, 'LKGLZ', '2021-12-14 12:00:11' );
INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1470604504423297026', '1465203901006192642', '已签到', '7', '', 7, 1, 'LKGLZ', '2021-12-14 12:00:11' );
ALTER TABLE `pay_meeting_situation`
ADD COLUMN `register_process` tinyint(2) NULL COMMENT '报名流程' AFTER `contract_id`;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java
+3 -3
View File
@@ -199,11 +199,11 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
}
/**
* 审核付款凭证
* 审核缴费凭证
*/
@RequiresPermissions("committeeMeetingSituation:auditCredentials")
@AutoLog(value = "审核付款凭证")
@ApiOperation(value = "审核付款凭证")
@AutoLog(value = "审核缴费凭证")
@ApiOperation(value = "审核缴费凭证")
@PostMapping(value = "/check")
public Result<?> check(@RequestBody CheckVO checkVO) {
payMeetingSituationService.check(checkVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java
+3 -3
View File
@@ -177,11 +177,11 @@ public class CouncilMeetingSituationController extends JeroController<PayMeeting
}
/**
* 审核付款凭证
* 审核缴费凭证
*/
@RequiresPermissions("councilMeetingSituation:auditCredentials")
@AutoLog(value = "审核付款凭证")
@ApiOperation(value = "审核付款凭证")
@AutoLog(value = "审核缴费凭证")
@ApiOperation(value = "审核缴费凭证")
@PostMapping(value = "/check")
public Result<?> check(@RequestBody CheckVO checkVO) {
payMeetingSituationService.check(checkVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java
+3 -3
View File
@@ -194,11 +194,11 @@ public class InternalMeetingSituationController extends JeroController<PayMeetin
}
/**
* 审核付款凭证
* 审核缴费凭证
*/
@RequiresPermissions("internalMeetingSituation:auditCredentials")
@AutoLog(value = "审核付款凭证")
@ApiOperation(value = "审核付款凭证")
@AutoLog(value = "审核缴费凭证")
@ApiOperation(value = "审核缴费凭证")
@PostMapping(value = "/check")
public Result<?> check(@RequestBody CheckVO checkVO) {
payMeetingSituationService.check(checkVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java
+3 -3
View File
@@ -184,11 +184,11 @@ public class OtherMeetingSituationController extends JeroController<PayMeetingSi
}
/**
* 审核付款凭证
* 审核缴费凭证
*/
@RequiresPermissions("otherMeetingSituation:auditCredentials")
@AutoLog(value = "审核付款凭证")
@ApiOperation(value = "审核付款凭证")
@AutoLog(value = "审核缴费凭证")
@ApiOperation(value = "审核缴费凭证")
@PostMapping(value = "/check")
public Result<?> check(@RequestBody CheckVO checkVO) {
payMeetingSituationService.check(checkVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java
+3 -3
View File
@@ -184,11 +184,11 @@ public class StandardsMeetingSituationController extends JeroController<PayMeeti
}
/**
* 审核付款凭证
* 审核缴费凭证
*/
@RequiresPermissions("standardsMeetingSituation:auditCredentials")
@AutoLog(value = "审核付款凭证")
@ApiOperation(value = "审核付款凭证")
@AutoLog(value = "审核缴费凭证")
@ApiOperation(value = "审核缴费凭证")
@PostMapping(value = "/check")
public Result<?> check(@RequestBody CheckVO checkVO) {
payMeetingSituationService.check(checkVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java
+3 -3
View File
@@ -184,11 +184,11 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
}
/**
* 审核付款凭证
* 审核缴费凭证
*/
@RequiresPermissions("workGroupMeetingSituation:auditCredentials")
@AutoLog(value = "审核付款凭证")
@ApiOperation(value = "审核付款凭证")
@AutoLog(value = "审核缴费凭证")
@ApiOperation(value = "审核缴费凭证")
@PostMapping(value = "/check")
public Result<?> check(@RequestBody CheckVO checkVO) {
payMeetingSituationService.check(checkVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+9 -1
View File
@@ -304,7 +304,15 @@ public class PayMeeting implements Serializable {
@TableField(exist = false)
private Integer registerCheckResult;
/**
* 报名信息待审核 1
* 凭证待审核 2
* 不可参会 3
* 待上传凭证 4
* 凭证被拒绝 5
* 待签到 6
* 已签到 7
*/
@TableField(exist = false)
@Dict(dicCode = "sign_up_status")
private Integer signUpStatus;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+4 -5
View File
@@ -295,8 +295,8 @@ public class PayMeetingSituation implements Serializable {
@Dict(dicCode = "invoice_type")
private Integer needInvoice;
/**付款凭证*/
@ApiModelProperty(value = "付款凭证")
/**缴费凭证*/
@ApiModelProperty(value = "缴费凭证")
private String paymentRecord;
/**订单后4位编码*/
@@ -363,9 +363,9 @@ public class PayMeetingSituation implements Serializable {
@ApiModelProperty(value = "对接人姓名")
private String dockName;
/**付款凭证审核状态*/
/**缴费凭证审核状态*/
//@Excel(name = "审核状态", width = 15)
@ApiModelProperty(value = "付款凭证审核状态")
@ApiModelProperty(value = "缴费凭证审核状态")
@Dict(dicCode = "signup_status")
private Integer checkResult;
@@ -431,7 +431,6 @@ public class PayMeetingSituation implements Serializable {
@TableField(exist = false)
private Boolean isZero;
@TableField(exist = false)
@ApiModelProperty(value = "报名流程")
private Integer registerProcess;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
+2 -1
View File
@@ -26,7 +26,8 @@ public interface PayMeetingMapper extends BaseMapper<PayMeeting> {
IPage<PayMeeting> pageListContract3(Page<PayMeeting> page,
@Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper,
@Param("now") String now);
@Param("now") String now,
@Param("contactId") String contactId);
IPage<PayMeeting> internelPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+36 -100
View File
@@ -72,26 +72,7 @@
case_committee_id,
case_committee_name,
notice,
(case
when meeting_type = 2 then null
when meeting_type = 3 then null
else pms.pay_mode
END
) as pay_mode,
(case
when meeting_type = 2 then null
when meeting_type = 3 then null
else pms.register_check_result
END
) as register_check_result,
(case
when meeting_type = 2 then null
when meeting_type = 3 then null
else pms.id
END
) as situationId,
pm.id,
GROUP_CONCAT(pms.company_contact_id) company_contact_ids,
(case
when date_format(start_time, '%Y-%m-%d') > #{now} then 2
@@ -142,24 +123,9 @@
case_committee_id,
case_committee_name,
notice,
(case
when meeting_type = 2 then null
when meeting_type = 3 then null
else pms.pay_mode
END
) as pay_mode,
(case
when meeting_type = 2 then null
when meeting_type = 3 then null
else pms.register_check_result
END
) as register_check_result,
(case
when meeting_type = 2 then null
when meeting_type = 3 then null
else pms.id
END
) as situationId,
pms.pay_mode as pay_mode,
pms.register_check_result as register_check_result,
pms.id as situationId,
pm.id,
(case
when date_format(start_time, '%Y-%m-%d') > #{now} then 2
@@ -176,69 +142,39 @@
<!-- 将原有id改为会议id, 新增situationId 为成员id -->
<select id="pageListContract3" resultMap="PayMeetingResultMap">
select distinct meeting_name,
meeting_type,
tb_meeting_type,
working_group_id,
working_group_name,
start_time,
end_time,
particular_year,
start_sign_in_time,
end_sign_in_time,
venue,
convoke_locale,
address,
estimated_number,
meeting_content,
register_deadline,
vip_invitation_code,
speaker_invitation_code,
guest_invitation_code,
cooperative_invitation_code,
meeting_costs,
meeting_costs_vip,
director_id,
director_name,
director_phone,
hotel_name,
hotel_address,
meeting_files,
meeting_data,
remind,
payment_qr_code,
case_committee_id,
case_committee_name,
notice,
(case
when meeting_type = 2 then null
when meeting_type = 3 then null
else pms.pay_mode
END
) as pay_mode,
(case
when meeting_type = 2 then null
when meeting_type = 3 then null
else pms.register_check_result
END
) as register_check_result,
(case
when meeting_type = 2 then null
when meeting_type = 3 then null
else pms.id
END
) as situationId,
pm.id,
(case
when date_format(start_time, '%Y-%m-%d') > #{now} then 2
when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now}
and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3
when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4
END
) as meetingStatus
from pay_meeting pm
left join pay_meeting_situation pms on pm.id = pms.meeting_id
left join pay_meeting_remind_record pmrr on pm.id = pmrr.meeting_id
SELECT *,
(case
when date_format(start_time, '%Y-%m-%d') > #{now} then 2
when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now}
and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3
when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4
END
) as meetingStatus
FROM (
SELECT pm.*,
pms.id situationId,
payment_record,
register_check_result,
check_result,
check_in
FROM pay_meeting pm
LEFT JOIN pay_meeting_situation pms ON pm.id = pms.meeting_id
LEFT JOIN pay_meeting_remind_record pmrr ON pm.id = pmrr.meeting_id
WHERE pms.company_contact_id = #{contactId}
OR pms.post_contact_id = #{contactId}
OR pmrr.contact_id = #{contactId}
UNION
SELECT pm.*,
NULL AS situationId,
NULL AS payment_record,
NULL AS register_check_result,
NULL AS check_result,
NULL AS check_in
FROM pay_meeting pm
WHERE pm.meeting_type = 2
OR pm.meeting_type = 3
OR pm.meeting_type = 4
) result
${ew.customSqlSegment}
</select>
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+13 -26
View File
@@ -631,36 +631,36 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}
String contactId = sysUser.getId();
queryWrapper.orderByDesc("pm.start_time");
queryWrapper.orderByDesc("start_time");
//
Integer signUpStatus = payMeeting.getSignUpStatus();
if (Objects.nonNull(signUpStatus)) {
switch (signUpStatus){
case 1:
queryWrapper.eq("pms.register_check_result",0);
queryWrapper.eq("register_check_result",0);
break;
case 2:
queryWrapper.eq("pms.register_check_result",1);
queryWrapper.isNotNull("pms.payment_record");
queryWrapper.eq("pms.check_result",0);
queryWrapper.eq("register_check_result",1);
queryWrapper.isNotNull("payment_record");
queryWrapper.eq("check_result",0);
break;
case 3:
queryWrapper.eq("pms.register_check_result",2);
queryWrapper.eq("register_check_result",2);
break;
case 4:
queryWrapper.eq("pms.register_check_result",1);
queryWrapper.isNull("pms.payment_record");
queryWrapper.ne("pms.check_result",1);
queryWrapper.eq("register_check_result",1);
queryWrapper.isNull("payment_record");
queryWrapper.ne("check_result",1);
break;
case 5:
queryWrapper.eq("pms.check_result",2);
queryWrapper.eq("check_result",2);
break;
case 7:
queryWrapper.eq("pms.check_in",1);
queryWrapper.eq("check_in",1);
break;
case 6:
queryWrapper.eq("pms.check_result",1);
queryWrapper.eq("check_result",1);
break;
}
}
@@ -687,20 +687,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
queryWrapper.eq("pms.company_contact_id", contactId);
return baseMapper.pageListContract2(page, queryWrapper, now);
} else {
queryWrapper.and(
a -> a.eq("pms.company_contact_id", contactId)
.or()
.eq("pms.post_contact_id", contactId)
.or()
.eq("pmrr.contact_id", contactId)
.or()
.eq("pm.meeting_type",MeetingCommon.STANDARD_MEETING)
.or()
.eq("pm.meeting_type",MeetingCommon.INTERNATIONAL_MEETING)
.or()
.eq("pm.meeting_type",MeetingCommon.OTHER_MEETING)
);
return baseMapper.pageListContract3(page, queryWrapper, now);
return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+63 -23
View File
@@ -170,7 +170,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
String meetingId = payMeetingSituation1.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
//上传付款凭证发送邮件提醒审批
//上传缴费凭证发送邮件提醒审批
//SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
//如果合同id存在则关联参会人到合同
@@ -207,11 +207,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
/**
* 上传付款凭证发送邮件提醒审批 M_OPEN_TYPE5
* 上传缴费凭证发送邮件提醒审批 M_OPEN_TYPE5
*/
private void SendPaymentRecordMessage(PayMeetingSituation payMeetingSituation, PayMeeting payMeeting) {
String paymentRecord = payMeetingSituation.getPaymentRecord();
//上传付款凭证发送邮件提醒审批
//上传缴费凭证发送邮件提醒审批
if (StringUtils.isNotBlank(paymentRecord)) {
String directorId = payMeeting.getDirectorId();
LoginUser director = iSysBaseApi.getUserById(directorId);
@@ -265,9 +265,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
private void saveMeetingSituation(PayMeetingSituation payMeetingSituation1) {
if (payMeetingSituation1.getIsZero()) {
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
}
payMeetingSituation1.setCheckIn(PayProjectCommon.NO);
payMeetingSituation1.setPaidAmount(new BigDecimal("0"));
@@ -325,8 +323,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//处理打包
//handlePack(payMeetingSituation1);
signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);
//上传付款凭证发送邮件提醒审批
//SendPaymentRecordMessage(payMeetingSituation1, payMeeting); 报名不上传付款凭证
//上传缴费凭证发送邮件提醒审批
//SendPaymentRecordMessage(payMeetingSituation1, payMeeting); 报名不上传缴费凭证
//报名后返回是否不需要审核
return Objects.equals(payMeetingSituation1.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)
&& Objects.equals(payMeetingSituation1.getCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1);
@@ -447,7 +445,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
String paymentRecord = payMeetingSituation.getPaymentRecord();
if (StrUtil.isBlank(paymentRecord)) {
throw new JeroBootException("付款凭证为空不能审核");
throw new JeroBootException("缴费凭证为空不能审核");
}
Integer oldCheckResult = payMeetingSituation.getCheckResult();
if (oldCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
@@ -456,8 +454,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
Integer checkResult = checkVO.getCheckResult();
String checkRemark = checkVO.getCheckRemark();
payMeetingSituation.setCheckResult(checkResult);
Integer registerProcess = payMeetingSituation.getRegisterProcess();
if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
payMeetingSituation.setCheckRemark(checkRemark);
if (Objects.equals(registerProcess,4)){
payMeetingSituation.setRegisterProcess(5);
}else if (Objects.equals(registerProcess,9)){
payMeetingSituation.setRegisterProcess(10);
}
updateById(payMeetingSituation);
//汇款凭证审核不通过
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG5, "C_OPEN_TYPE5");
@@ -466,6 +470,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//payMeetingSituation.setInAccount(PayProjectCommon.YES);
//设置实收金额
//payMeetingSituation.setPaidAmount(payMeetingSituation.getAmountReceivable());
if (Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){
payMeetingSituation.setRegisterProcess(6);
}else if (Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
payMeetingSituation.setRegisterProcess(11);
}
updateById(payMeetingSituation);
List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
PayPaymentRecord payPaymentRecord = new PayPaymentRecord();
@@ -524,6 +533,19 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
Integer checkResult = checkVO.getCheckResult();
payMeetingSituation.setRegisterCheckResult(checkResult);
if (isZeroOrNull(payMeetingSituation.getAmountReceivable())) {
if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
payMeetingSituation.setRegisterProcess(14);
}else {
payMeetingSituation.setRegisterProcess(13);
}
}else {
if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
payMeetingSituation.setRegisterProcess(3);
}else {
payMeetingSituation.setRegisterProcess(2);
}
}
saveOrUpdate(payMeetingSituation);
//如果驳回就发送消息给参会人
@@ -701,6 +723,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
meetingSituation.setCheckIn(PayProjectCommon.YES);
meetingSituation.setCheckFile(signInVO.getFileId());
meetingSituation.setCheckInTime(new Date());
Integer registerProcess = meetingSituation.getRegisterProcess();
if (Objects.equals(registerProcess,3)){
meetingSituation.setRegisterProcess(8);
}else if (Objects.equals(registerProcess,6)){
meetingSituation.setRegisterProcess(7);
}else if (Objects.equals(registerProcess,14)){
meetingSituation.setRegisterProcess(15);
}
saveOrUpdate(meetingSituation);
}
SignInPageVO signInPageVO = putDate(payMeeting, meetingSituation);
@@ -785,7 +815,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation.setPaymentRecord(paymentRecord);
payMeetingSituation.setOrderCode(orderCode);
payMeetingSituation.setCheckResult(0);
Integer registerProcess = payMeetingSituation.getRegisterProcess();
if (Objects.equals(registerProcess,3)){
payMeetingSituation.setRegisterProcess(4);
}else if (Objects.equals(registerProcess,8)){
payMeetingSituation.setRegisterProcess(9);
}
updateById(payMeetingSituation);
PayMeeting payMeeting = meetingService.getById(meetingId);
@@ -867,7 +902,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
BeanUtils.copyProperties(payMeetingSituationVO, payMeetingSituation);
//处理校验参会人信息
PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
//判断是否修改付款凭证
//判断是否修改缴费凭证
Integer checkResult = oldObject.getCheckResult();
if (Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) {
ObjRecordUtilModule objRecordUtilModule = ObjRecordUtil.addRecord(oldObject, payMeetingSituation1);
@@ -919,7 +954,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
String paymentRecord = oldObject.getPaymentRecord();
String paymentRecord1 = payMeetingSituation1.getPaymentRecord();
if (Objects.equals(paymentRecord, paymentRecord1)) {
//上传付款凭证发送邮件提醒审批
//上传缴费凭证发送邮件提醒审批
SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
}
//处理打包情况
@@ -959,7 +994,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
//处理联系人
canHuiContact(payMeetingSituation1, companyId, contactsManagement);
//处理付款凭证
//处理缴费凭证
payMeetingSituation1.setPaymentRecord(null);
//存入打包字段
@@ -1032,6 +1067,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
CommonPeopleVO commonPeopleVO = new CommonPeopleVO();
BeanUtils.copyProperties(payMeetingSituation, commonPeopleVO);
Integer payMode = commonPeopleVO.getPayMode();
payMeetingSituation1.setPayMode(payMode);
//所有缴费方式，都有需要发票
Integer needInvoice = commonPeopleVO.getNeedInvoice();
@@ -1050,9 +1086,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
throw new JeroBootException("合同不存在！");
}
if (!isZero &&!payMode.equals(MeetingSubitemCommon.PAY_MODE_3)){
//合同添加的参会人，付款凭证和订单号后四位必填
//合同添加的参会人，缴费凭证和订单号后四位必填
if (StringUtils.isBlank(paymentRecord)) {
throw new JeroBootException("付款凭证必填");
throw new JeroBootException("缴费凭证必填");
}
if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2) && StringUtils.isBlank(orderCode)) {
throw new JeroBootException("订单号后四位必填");
@@ -1065,7 +1101,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
Date endTime = payMeeting.getEndTime();
//如果不在会议期间，不允许上传缴费凭证
if (!belongCalendar(new Date(), startTime, endTime)) {
throw new JeroBootException("线上缴费时，付款凭证只能在会议期间上传");
throw new JeroBootException("线上缴费时，缴费凭证只能在会议期间上传");
}
}
}
@@ -1153,6 +1189,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
}
}
if (payMeetingSituation1.getIsZero()) {
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
payMeetingSituation1.setRegisterProcess(12);
}else {
payMeetingSituation1.setRegisterProcess(1);
}
return payMeetingSituation1;
}
@@ -1266,17 +1309,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
PayIncomeContract incomeContract = payIncomeContractService.getById(contractId);
meetingSituation.setContractNum(incomeContract.getContractNum());
}
BigDecimal amountReceivable = meetingSituation.getAmountReceivable();
//不需要缴费
if (amountReceivable==null||amountReceivable.compareTo(new BigDecimal(0)) == 0){
}else {
}
return meetingSituation;
}
private boolean isZeroOrNull(BigDecimal amountReceivable) {
return amountReceivable == null || amountReceivable.compareTo(new BigDecimal(0)) == 0;
}
/**
* 列表查询
*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonPeopleVO.java
+3 -3
View File
@@ -52,9 +52,9 @@ public class CommonPeopleVO{
@Max(2)
private Integer needInvoice;
/**付款凭证*/
@Excel(name = "付款凭证", width = 15)
@ApiModelProperty(value = "付款凭证")
/**缴费凭证*/
@Excel(name = "缴费凭证", width = 15)
@ApiModelProperty(value = "缴费凭证")
private String paymentRecord;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java
+2 -2
View File
@@ -249,8 +249,8 @@ public class MeetingSituationContractVO {
@Dict(dicCode = "invoice_type")
private Integer needInvoice;
/**付款凭证*/
@ApiModelProperty(value = "付款凭证")
/**缴费凭证*/
@ApiModelProperty(value = "缴费凭证")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String paymentRecord;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
+3 -3
View File
@@ -273,9 +273,9 @@ public class PayMeetingSituationVO {
@Dict(dicCode = "invoice_type")
private Integer needInvoice;
/**付款凭证*/
@Excel(name = "付款凭证", width = 15)
@ApiModelProperty(value = "付款凭证")
/**缴费凭证*/
@Excel(name = "缴费凭证", width = 15)
@ApiModelProperty(value = "缴费凭证")
private String paymentRecord;
/**