From 487b94fd0742763a20a850edf0a8689b0dd9a449 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 27 Mar 2024 16:17:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=2083121=20=E5=9C=A8=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=9C=A8=E7=AE=A1=E7=90=86=E7=AB=AF=E6=8B=92?=
 =?UTF-8?q?=E7=BB=9D--=E6=8B=92=E7=BB=9D=E5=90=8E=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E4=B8=94=E6=B2=A1=E6=9C=89=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayPaymentCheckServiceImpl.java      | 33 ++-----------------
 1 file changed, 2 insertions(+), 31 deletions(-)

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 cbce5a24..0c7ddf28 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
@@ -648,14 +648,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
                 //更新主列表
                 tbMemberProjectSubitemMapper.updateById(tbMember);
-
-                //拼装推到标协缴费的参数
-                //List<TbCheckVo> typr5List = new ArrayList<>();
-                //BeanUtils.copyProperties(payPaymentRecord,tbCheckVo);
-                //tbCheckVo.setId(tbMember.getTbPaymentId());
-                //tbCheckVo.setCheckMark(payPaymentRecord.getReviewInstructions());
-                //typr5List.add(tbCheckVo);
-                //payPaymentRecordService.pushToStandards(typr5List);
                 
                 break;
             //标协证书
@@ -727,15 +719,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
                 //更新主列表
                 certificatePaymentMapper.updateById(tbMemberCertificate);
-
-                ////拼装推到标协缴费的参数
-                //List<TbCheckVo> typr6List = new ArrayList<>();
-                //BeanUtils.copyProperties(payPaymentRecord,tbCheckCerVo);
-                //tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId());
-                //tbCheckCerVo.setCheckMark(payPaymentRecord.getReviewInstructions());
-                //typr6List.add(tbCheckCerVo);
-                //JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr6List);
-
                 break;
             default:break;
         }
@@ -747,7 +730,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
         if(PayIncomeContractCommon.PROJECT_TYPE1.equals(String.valueOf(payPaymentRecord.getProjectType())) ||
                 PayIncomeContractCommon.PROJECT_TYPE2.equals(String.valueOf(payPaymentRecord.getProjectType())) ||
-                PayIncomeContractCommon.PROJECT_TYPE4.equals(String.valueOf(payPaymentRecord.getProjectType()))){
+                PayIncomeContractCommon.PROJECT_TYPE4.equals(String.valueOf(payPaymentRecord.getProjectType()))||
+                PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(payPaymentRecord.getProjectType()))){
             //更新来款记录表子表
             PayPaymentRecordSub sub = new PayPaymentRecordSub();
             sub.setId(subId);
@@ -759,19 +743,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
             sub.setReviewInstructions(payPaymentRecord.getReviewInstructions());
             payPaymentCheckMapper.updateById(sub);
         }
-        if(PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(payPaymentRecord.getProjectType())) ||
-                PayIncomeContractCommon.PROJECT_TYPE6.equals(String.valueOf(payPaymentRecord.getProjectType()))){
-            if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())){
-                //新增来款记录表子表。本记录目前没用上，只有普通、工作组、会员项目在企业端会同时查看直接来款记录+审核来款记录
-                PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
-                BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
-                payPaymentRecordSub.setId(null);
-                payPaymentRecordSub.setLastSign(LastSignEnum.LAST.getCode());
-                payPaymentRecordSub.setDelFlag(PayProjectCommon.NO);
-                payPaymentRecordSub.setRecordId(payPaymentRecord.getId());
-                payPaymentCheckMapper.insert(payPaymentRecordSub);
-            }
-        }
 
     }