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

fix 缴费方式为线上缴费时，判断是否为会议期间

Browse Source
This commit is contained in:
lijiarao
2021-09-24 16:53:35 +08:00
parent 368ac7370b
commit f20f4bd0b7
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
+5
View File
@@ -18,6 +18,11 @@ public class MeetingSubitemCommon {
*/
public final static Integer NEI_BU_QI_YE = 3;
/**
* 缴费方式:线上缴费
*/
public final static Integer PAY_MODE_2 = 2;
/**
* 缴费方式:打包
*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+24 -4
View File
@@ -7,10 +7,16 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.common.ProjectCommon;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.enums.ManagementMessageEnums;
import com.jero.common.common.ProjectCommon;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.SendMessageService;
import com.jero.common.service.ContractCreateProjectSendMessageService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
import com.jero.company.entity.PayCompanyManagement;
import com.jero.company.entity.PayContactsManagement;
@@ -96,6 +102,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
@Resource
private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
@Resource
private SendMessageService sendMessageService;
@Resource
private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
/**
@@ -506,11 +514,23 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
} else {
ValidUtil.validate(commonPeopleVO, NotPack.class);
payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
//缴费方式为线上缴费时，判断是否为会议期间
String paymentRecord = payMeetingSituation.getPaymentRecord();
payMeetingSituation1.setPaymentRecord(paymentRecord);
payMeetingSituation1.setOrderCode(payMeetingSituation.getOrderCode());
if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2)){
Date startTime = payMeeting.getStartTime();
Date endTime = payMeeting.getEndTime();
//如果不在会议期间，不允许上传缴费凭证
if (!belongCalendar(new Date(),startTime,endTime)) {
throw new JeroBootException("线上缴费时，付款凭证和订单后四位编码只能在会议期间上传");
}
payMeetingSituation1.setPaymentRecord(paymentRecord);
payMeetingSituation1.setOrderCode(payMeetingSituation.getOrderCode());
}else {
payMeetingSituation1.setPaymentRecord(paymentRecord);
}
payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
//如果是标协会议判断会员类型
if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
//根据企业名称和会员类型不为null判断是否为标协会员