fix bug 40566 国际研讨会--会议详情--缴费方式为打包的参会人删除时报错

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);
     }
 

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());
         }
     }