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

add 企业端我的会议增加报名状态查询

Browse Source
This commit is contained in:
lijiarao
2021-11-29 16:55:25 +08:00
parent 7ea8c706da
commit 3dec100630
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+3 -1
View File
@@ -140,7 +140,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
if (Objects.equals(registerCheckResult,0)){
meeting.setSignUpStatus(1);
// 凭证审核中：非成员单位审核通过/不是非成员单位，来款方式为：汇款/线上缴费上传完凭证的；
}else if (Objects.equals(registerCheckResult,1)&&StringUtils.isNotBlank(paymentRecord)){
}else if (Objects.equals(registerCheckResult,1)
&&StringUtils.isNotBlank(paymentRecord)
&&Objects.equals(checkResult,0)){
meeting.setSignUpStatus(2);
// 不可参会：非成员单位审核拒绝的
}else if (Objects.equals(registerCheckResult,2)){
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+1
View File
@@ -618,6 +618,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
case 2:
queryWrapper.eq("pms.register_check_result",1);
queryWrapper.isNotNull("pms.payment_record");
queryWrapper.eq("pms.check_result",0);
break;
case 3:
queryWrapper.eq("pms.register_check_result",2);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+16 -7
View File
@@ -66,10 +66,8 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import java.io.File;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -852,6 +850,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (ObjectUtil.isNull(payMeetingSituation)) {
throw new JeroBootException("参会人错误!");
}
payMeetingSituationVO.setAmountReceivable(payMeetingSituation.getAmountReceivable());
BeanUtils.copyProperties(payMeetingSituationVO, payMeetingSituation);
//处理校验参会人信息
PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
@@ -949,6 +948,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
canHuiContact(payMeetingSituation1, companyId, contactsManagement);
//处理付款凭证
payMeetingSituation1.setPaymentRecord(null);
//处理应收金额为0
BigDecimal amountReceivable = payMeetingSituation1.getAmountReceivable();
boolean isZero = false;
if (Objects.nonNull(amountReceivable)) {
isZero = amountReceivable.compareTo(new BigDecimal("0.00")) == 0;
}
//存入打包字段
payMeetingSituation1.setPack(PayProjectCommon.PACKAGING0);
payMeetingSituation1.setNeedInvoice(PayProjectCommon.NO);
@@ -1009,7 +1014,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//所有缴费方式，都有需要发票
Integer needInvoice = commonPeopleVO.getNeedInvoice();
//需要发票时校验邮寄
if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
if (ProjectCommon.NEED_INVOICE1.equals(needInvoice)
||ProjectCommon.NEED_INVOICE2.equals(needInvoice)) {
ValidUtil.validate(commonPeopleVO, NotPack.class);
}
String paymentRecord = payMeetingSituation.getPaymentRecord();
@@ -1021,7 +1027,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (Objects.isNull(payIncomeContract)) {
throw new JeroBootException("合同不存在！");
}
if (!payMode.equals(MeetingSubitemCommon.PAY_MODE_3)){
if (!isZero &&!payMode.equals(MeetingSubitemCommon.PAY_MODE_3)){
//合同添加的参会人，付款凭证和订单号后四位必填
if (StringUtils.isBlank(paymentRecord)) {
throw new JeroBootException("付款凭证必填");
@@ -1032,7 +1038,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
} else {
//缴费方式为线上缴费时，判断是否为会议期间
if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2) && StringUtils.isNotBlank(paymentRecord)) {
if (MeetingSubitemCommon.PAY_MODE_2.equals(payMode) && StringUtils.isNotBlank(paymentRecord)) {
Date startTime = payMeeting.getStartTime();
Date endTime = payMeeting.getEndTime();
//如果不在会议期间，不允许上传缴费凭证
@@ -1061,9 +1067,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
} else {
payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
}
ValidUtil.validate(commonPeopleVO);
if (!isZero){
ValidUtil.validate(commonPeopleVO);
}
//需要发票时校验邮寄
if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
if (ProjectCommon.NEED_INVOICE1.equals(needInvoice)
||ProjectCommon.NEED_INVOICE2.equals(needInvoice)){
//校验邮寄联系人
String postContactId = commonPeopleVO.getPostContactId();
PayContactsManagement postContact = contactsManagementService.getById(postContactId);