From 62df017c5efa6091522f0c28b0a340916c40cf2b Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Mon, 20 Dec 2021 16:38:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IPayPaymentRecordService.java | 5 + .../impl/PayPaymentCheckServiceImpl.java | 108 +++++++++++++++--- .../impl/PayPaymentRecordServiceImpl.java | 34 ++++-- 3 files changed, 118 insertions(+), 29 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java index e7654af3..59862a10 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java @@ -90,6 +90,11 @@ public interface IPayPaymentRecordService extends IService { * @param payPaymentRecord */ void editAmountReceived(PayPaymentRecord payPaymentRecord); + /** + * 标协会员项目来款推送到标协项目 + * @param typr5List + */ + void pushToStandards(List typr5List); /** * 导出 * @param request diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 76594a3f..770837cf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.payment.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -14,17 +15,18 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.meeting.mapper.PayMeetingSituationMapper; -import com.jero.member.entity.PayMemberProject; -import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.entity.*; import com.jero.member.mapper.PayMemberProjectSubitemMapper; import com.jero.member.mapper.TbCertificatePaymentMapper; import com.jero.member.mapper.TbMemberProjectSubitemMapper; import com.jero.member.service.IPayMemberProjectService; +import com.jero.member.service.ITbMemberProjectService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.payment.entity.PayPaymentRecord; @@ -33,12 +35,15 @@ import com.jero.payment.mapper.PayPaymentCheckMapper; import com.jero.payment.mapper.PayPaymentRecordMapper; import com.jero.payment.service.IPayPaymentCheckService; import com.jero.payment.service.IPayPaymentRecordService; +import com.jero.payment.vo.TbCheckVo; +import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; import com.jero.project.service.IPayWorkingGroupService; +import com.jero.temporary.entity.PayContactsManagementTemporary; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -77,6 +82,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl typr5List = new ArrayList<>(); + tbCheckVo.setId(tbMember.getTbPaymentId()); + tbCheckVo.setCheckMark(payPaymentRecord.getRemark()); + typr5List.add(tbCheckVo); + payPaymentRecordService.pushToStandards(typr5List); + + break; + //标协证书 + case PayIncomeContractCommon.PROJECT_TYPE6: + TbCertificatePayment tbMemberCertificate = certificatePaymentMapper.selectById(payPaymentRecord.getProjectId()); + TbMemberProject tbMemberProjectCertificate = tbMemberProjectService.getById(tbMemberCertificate.getProjectId()); + + TbCheckVo tbCheckCerVo = new TbCheckVo(); + + if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) { + //已同意 + newPaidAmount =payPaymentRecordService.addPaidAmount(tbMemberCertificate.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收 + inAccount = payPaymentRecordService.getInAccount(tbMemberCertificate.getAmountReceivable(), newPaidAmount);//到账状态 + tbMemberCertificate.setPaidAmount(newPaidAmount); + tbMemberCertificate.setInAccount(inAccount); + paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态 + + tbCheckCerVo.setCheckResult(PayProjectCommon.YES); + }else{ + paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), tbMemberCertificate.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态 + //发消息参数 + principalId = tbMemberProjectCertificate.getDirectorId(); + project = tbMemberProjectCertificate.getProjectName(); + + tbCheckCerVo.setCheckResult(PayProjectCommon.NO); + } + + tbMemberCertificate.setPaymentStatus(paymentStatus); + //更新主列表 + certificatePaymentMapper.updateById(tbMemberCertificate); + + //拼装推到标协缴费的参数 + List typr6List = new ArrayList<>(); + tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId()); + tbCheckCerVo.setCheckMark(payPaymentRecord.getRemark()); + typr6List.add(tbCheckCerVo); + JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr6List); + break; default:break; } + //发消息 + checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType())); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 466a4151..2ba0645f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -155,18 +155,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl0){ - JSONObject jsonObject = AuthenticationUtils.postResult("/paymentInfo/incomingPaymentCheckMember", null, typr5List); - String memberNo = jsonObject.getString("memberNo"); - Integer memberType = jsonObject.getInteger("memberType"); - Integer memberStatus = jsonObject.getInteger("memberStatus"); - MemberInfo memberInfo = new MemberInfo(); - memberInfo.setMemberNo(memberNo); - memberInfo.setMemberType(memberType); - memberInfo.setMemberStatus(memberStatus); - for (TbCheckVo tbCheckVo : typr5List) { - String id = tbCheckVo.getId(); - updateStandards(id,memberInfo); - } + pushToStandards(typr5List); } //证书到账推送到会员系统 if(typr6List.size()>0){ @@ -906,6 +895,27 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl typr5List){ + JSONObject jsonObject = AuthenticationUtils.postResult("/paymentInfo/incomingPaymentCheckMember", null, typr5List); + String memberNo = jsonObject.getString("memberNo"); + Integer memberType = jsonObject.getInteger("memberType"); + Integer memberStatus = jsonObject.getInteger("memberStatus"); + MemberInfo memberInfo = new MemberInfo(); + memberInfo.setMemberNo(memberNo); + memberInfo.setMemberType(memberType); + memberInfo.setMemberStatus(memberStatus); + for (TbCheckVo tbCheckVo : typr5List) { + String id = tbCheckVo.getId(); + updateStandards(id,memberInfo); + } + } + + /** * 导出 * @param request