From dbc5cdb12f30827bdd1d4a0f1c287b59d7840e00 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 7 Aug 2024 15:47:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=84=E7=90=86=E6=A0=87=E5=8D=8F?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=9C=AA=E7=BC=B4=E8=B4=B9=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/24年6月变更.sql                                             | 3 +++
 .../jero/payment/service/impl/PayPaymentCheckServiceImpl.java  | 2 ++
 .../jero/payment/service/impl/PayPaymentRecordServiceImpl.java | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql
index 621beffe..a274ad40 100644
--- a/db/24年6月变更.sql
+++ b/db/24年6月变更.sql
@@ -241,3 +241,6 @@ INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `
 DELETE FROM sys_permission where id = '1812785413516914690';
 UPDATE sys_permission SET menu_type = 0 , parent_id = NULL, sort_no = 4.2, icon = 'fund',hidden = 0 WHERE id = '1808757213186904065';
 UPDATE sys_permission SET `name`= '会议信息统计', menu_type = 1 , parent_id = '1437320526513905666',  icon = NULL, sort_no = 14.00 WHERE id = '1626061755230580738';
+
+-- 处理标协会员未缴费历史数据
+update tb_member_project_subitem set member_status = 3 where member_status != 3 and payment_status =  'completed';
\ No newline at end of file
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 e39f90ff..70b444d2 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
@@ -24,6 +24,7 @@ import com.jero.config.StaticConfig;
 import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.meeting.mapper.PayMeetingSituationMapper;
 import com.jero.member.entity.*;
+import com.jero.member.enums.MemberStatusEnum;
 import com.jero.member.mapper.PayMemberProjectSubitemMapper;
 import com.jero.member.mapper.TbCertificatePaymentMapper;
 import com.jero.member.mapper.TbMemberProjectSubitemMapper;
@@ -269,6 +270,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 TbMemberProject memberProject = tbMemberProjectService.getById(subitem.getProjectId());
 
                 subitem.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
+                subitem.setMemberStatus(MemberStatusEnum.PAID.getValue());
                 tbMemberProjectSubitemMapper.updateById(subitem);
 
                 //发消息参数
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 e122455e..1f7b3aee 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
@@ -33,6 +33,7 @@ import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.mapper.PayMeetingSituationMapper;
 import com.jero.meeting.service.IPayMeetingService;
 import com.jero.member.entity.*;
+import com.jero.member.enums.MemberStatusEnum;
 import com.jero.member.mapper.PayMemberProjectSubitemMapper;
 import com.jero.member.mapper.TbCertificatePaymentMapper;
 import com.jero.member.mapper.TbMemberProjectSubitemMapper;
@@ -552,6 +553,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 tbMember.setInAccount(inAccount);
                 if ("check".equals(checkOrRecord)){
                     tbMember.setPaymentStatus(paymentStatus);
+                    tbMember.setMemberStatus(MemberStatusEnum.PAID.getValue());
                 }
                 tbMemberProjectSubitemMapper.updateById(tbMember);