From c8bf5ed97d9af0611fffc0f51524c8ba0c20b6b0 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 6 Aug 2024 15:36:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=2088057=20=E5=88=B0=E8=B4=A6=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8-=E6=9C=AA=E5=AE=A1=E6=A0=B8=E5=85=88=E6=9D=A5?=
 =?UTF-8?q?=E6=AC=BE=E5=90=8E=EF=BC=8C=E7=8A=B6=E6=80=81=E7=9A=84=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayPaymentRecordServiceImpl.java     | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

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 a01a05a3..e122455e 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
@@ -182,19 +182,20 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             }
             //插入待审核状态，供前端判断是否显示审核按钮
             //先查审核记录表有没有待审核的
-            if(projectIdPaymentStatusMap.containsKey(id)){
-                String paymentStatus = projectIdPaymentStatusMap.get(id);
-                if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)){
-                    commonProject.setCheckPaymentStatus(paymentStatus);
-                    continue;
-                }
-            }
-            //再查项目主表状态是不是待审核
-            if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){
-                if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(commonProject.getPaymentStatus())){
-                    commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus());
-                }
-            }
+            //if(projectIdPaymentStatusMap.containsKey(id)){
+            //    String paymentStatus = projectIdPaymentStatusMap.get(id);
+            //    if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)){
+            String paymentStatus = commonProject.getPaymentStatus();
+            commonProject.setCheckPaymentStatus(paymentStatus);
+            //        continue;
+            //    }
+            //}
+            ////再查项目主表状态是不是待审核
+            //if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){
+            //    if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(commonProject.getPaymentStatus())){
+            //        commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus());
+            //    }
+            //}
             //会议、标协会员、标协证书，来款单位拼接“未审核”
             //if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))||
             //        commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE5))||
@@ -420,7 +421,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 //更新主列表
                 payCommonProject.setPaidAmount(newPaidAmount);
                 payCommonProject.setInAccount(inAccount);
-                payCommonProject.setPaymentStatus(paymentStatus);
+                if ("check".equals(checkOrRecord)){
+                    payCommonProject.setPaymentStatus(paymentStatus);
+                }
                 payCommonProjectMapper.updateById(payCommonProject);
 
                 break;
@@ -452,7 +455,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 //更新主列表
                 payWorking.setPaidAmount(newPaidAmount);
                 payWorking.setInAccount(inAccount);
-                payWorking.setPaymentStatus(paymentStatus);
+                if ("check".equals(checkOrRecord)){
+                    payWorking.setPaymentStatus(paymentStatus);
+                }
                 payWorkingGroupSubItemMapper.updateById(payWorking);
 
                 break;
@@ -482,7 +487,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 //更新主列表
                 meeting.setPaidAmount(newPaidAmount);
                 meeting.setInAccount(inAccount);
-                meeting.setPaymentStatus(paymentStatus);
+                if ("check".equals(checkOrRecord)){
+                    meeting.setPaymentStatus(paymentStatus);
+                }
                 payMeetingSituationMapper.updateById(meeting);
 
                 break;
@@ -511,7 +518,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 //更新主列表
                 member.setPaidAmount(newPaidAmount);
                 member.setInAccount(inAccount);
-                member.setPaymentStatus(paymentStatus);
+                if ("check".equals(checkOrRecord)){
+                    member.setPaymentStatus(paymentStatus);
+                }
                 payMemberProjectSubitemMapper.updateById(member);
 
                 break;
@@ -541,7 +550,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 //更新主列表
                 tbMember.setPaidAmount(newPaidAmount);
                 tbMember.setInAccount(inAccount);
-                tbMember.setPaymentStatus(paymentStatus);
+                if ("check".equals(checkOrRecord)){
+                    tbMember.setPaymentStatus(paymentStatus);
+                }
                 tbMemberProjectSubitemMapper.updateById(tbMember);
 
                 //    生成会员有效期
@@ -574,16 +585,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 //更新主列表
                 tbMemberCertificate.setPaidAmount(newPaidAmount);
                 tbMemberCertificate.setInAccount(inAccount);
-                tbMemberCertificate.setPaymentStatus(paymentStatus);
+                if ("check".equals(checkOrRecord)){
+                    tbMemberCertificate.setPaymentStatus(paymentStatus);
+                }
                 certificatePaymentMapper.updateById(tbMemberCertificate);
 
-                //拼装推到标协缴费的参数
-//                TbCheckVo tbCheckCerVo = new TbCheckVo();
-//                tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId());
-//                tbCheckCerVo.setCheckResult(PayProjectCommon.YES);
-////                tbCheckCerVo.setCheckMark(payPaymentRecord.getRemark());
-//                typr6List.add(tbCheckCerVo);
-
                 break;
             // 打包项目
             case PayIncomeContractCommon.PROJECT_TYPE8: