From 880d6494c8c0345ec4c985415f2f5c26fc446f2f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 13 Oct 2021 16:55:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2040566=20=E5=9B=BD=E9=99=85=E7=A0=94?=
 =?UTF-8?q?=E8=AE=A8=E4=BC=9A--=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85--?=
 =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E6=96=B9=E5=BC=8F=E4=B8=BA=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=9A=84=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=88=A0=E9=99=A4=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingSituationController.java    |  2 ++
 .../service/impl/PayMeetingSituationServiceImpl.java | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index 88467492..b9e93dff 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -205,6 +205,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         if (payMeetingSituation == null) {
             return Result.error("未找到对应数据");
         }
+        payMeetingSituation.setPhone(PasswordUtil.decrypt(payMeetingSituation.getPhone()));
         return Result.OK(payMeetingSituation);
     }
 
@@ -220,6 +221,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         if (payMeetingSituation == null) {
             return Result.error("未找到对应数据");
         }
+        payMeetingSituation.setPhone(PasswordUtil.decrypt(payMeetingSituation.getPhone()));
         return Result.OK(payMeetingSituation);
     }
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 3a5068b6..f83dc140 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -214,6 +214,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                     PayProjectCommon.PROJECT_TYPE3,
                     PayProjectCommon.PACKAGING1
             );
+        }else {
+            LambdaQueryWrapper<PayPackCompanyProject> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayPackCompanyProject::getProjectId, payMeetingSituation1.getId());
+            PayPackCompanyProject payPackCompanyProject = payPackCompanyProjectService.getOne(wrapper);
+            if (payPackCompanyProject!=null){
+                payPackCompanyProjectService.removeById(payPackCompanyProject.getId());
+            }
         }
     }
 
@@ -740,6 +747,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             //上传付款凭证发送邮件提醒审批
             SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
         }
+        //处理打包情况
+        handlePack(payMeetingSituation1);
     }
 
     /**
@@ -760,6 +769,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         //校验公共属性
         ValidUtil.validate(meetingEntity);
         BeanUtils.copyProperties(meetingEntity, payMeetingSituation1);
+        payMeetingSituation1.setPhone(PasswordUtil.encrypt(payMeetingSituation1.getPhone()));
         //校验企业
         String companyId = meetingEntity.getCompanyId();
         PayCompanyManagement companyManagement = companyManagementService.getById(companyId);
@@ -1017,7 +1027,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             LambdaQueryWrapper<PayPackCompanyProject> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(PayPackCompanyProject::getProjectId, id);
             PayPackCompanyProject payPackCompanyProject = payPackCompanyProjectService.getOne(wrapper);
-            payPackCompanyProjectService.removePayPackCompanyProject(payPackCompanyProject);
+            payPackCompanyProjectService.removeById(payPackCompanyProject.getId());
         }
     }