diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index 94f71011..40998248 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -181,12 +181,164 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 @AutoLog(value = "邮寄票据-修改")
 	 @ApiOperation(value="邮寄合同-修改", notes="邮寄合同-修改")
 	 @PostMapping(value = "/editTwo")
+	 @Transactional
 	 public Result<?> editTwo(@RequestBody PayMailBill payMailBill
 	 ) {
+		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 payMailBill.setPostStatus(1);
 		 payMailBill.setContactMobile(PasswordUtil.encrypt(payMailBill.getContactMobile()));
 		 payMailBillService.updateById(payMailBill);
-		 payMailBillService.pushBillEditToStandards(payMailBill);
+		 //变更5种项目的邮寄状态
+		 LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
+		 queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId());
+		 List<PayMailBillProject> list1 = payMailBillProjectService.list(queryPayMailBillProject);
+		 for(PayMailBillProject one:list1) {
+			 if (ObjectUtils.isNotEmpty(one)) {
+				 String project = "";
+				 String principalId = "";
+				 List<PayContactsManagementTemporary> listId = new ArrayList<>();
+				 //判断变更那个项目的邮寄状态
+				 if (GlobalConstants.ONE.equals(one.getProjectType())) {
+					 PayCommonProject payCommonProjectOld = payCommonProjectService.getById(one.getProjectId());
+					 if(Objects.isNull(payCommonProjectOld)){
+						 throw new JeroBootException("项目不存在！");
+					 }
+					 PayContactsManagementTemporary payCommonProjectTemporary = payContactsManagementTemporaryService.getById(payCommonProjectOld.getContactsTemporaryId());
+					 if(!Objects.isNull(payCommonProjectTemporary)){
+						 listId.add(payCommonProjectTemporary);
+					 }
+					 project = payCommonProjectOld.getChargeProject();
+					 principalId = payCommonProjectOld.getPrincipalId();
+				 } else if (GlobalConstants.TWO.equals(one.getProjectType())) {
+					 PayWorkingGroupSubItem payWorkingGroupSubItemOld = payWorkingGroupSubItemService.getById(one.getProjectId());
+					 if(Objects.isNull(payWorkingGroupSubItemOld)){
+						 throw new JeroBootException("项目不存在！");
+					 }
+					 PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItemOld.getWorkingGroupId());
+					 if(Objects.isNull(payWorkingGroup)){
+						 throw new JeroBootException("工作组不存在！");
+					 }
+					 PayContactsManagementTemporary payWorkingTemporaryOne = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdOne());
+					 if(!Objects.isNull(payWorkingTemporaryOne)){
+						 listId.add(payWorkingTemporaryOne);
+					 }
+					 if(!org.apache.commons.lang3.StringUtils.isBlank(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo())){
+						 PayContactsManagementTemporary payWorkingTemporaryTwo = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo());
+						 if(!Objects.isNull(payWorkingTemporaryTwo)){
+							 listId.add(payWorkingTemporaryTwo);
+						 }
+					 }
+					 if(!org.apache.commons.lang3.StringUtils.isBlank(payWorkingGroupSubItemOld.getContactsTemporaryIdThree())){
+						 PayContactsManagementTemporary payWorkingTemporaryThree = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdThree());
+						 if(!Objects.isNull(payWorkingTemporaryThree)){
+							 listId.add(payWorkingTemporaryThree);
+						 }
+					 }
+					 project = payWorkingGroup.getWorkingGroupProject();
+					 principalId = payWorkingGroup.getPrincipalIdA();
+				 } else if (GlobalConstants.THERE.equals(one.getProjectType())) {
+					 PayMeetingSituation meetingPayContactsManagementOld = payMeetingSituationService.getById(one.getProjectId());
+					 if(Objects.isNull(meetingPayContactsManagementOld)){
+						 throw new JeroBootException("项目不存在！");
+					 }
+					 PayMeeting payMeeting = payMeetingService.getById(meetingPayContactsManagementOld.getMeetingId());
+					 if(Objects.isNull(payMeeting)){
+						 throw new JeroBootException("会议不存在！");
+					 }
+					 PayContactsManagement meetingPayContactsManagement = payContactsManagementService.getById(meetingPayContactsManagementOld.getContractId());
+					 if(!Objects.isNull(meetingPayContactsManagement)){
+						 String str = JSON.toJSONString(meetingPayContactsManagement);
+						 PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
+						 listId.add(meetingTemporary);
+					 }
+					 project = payMeeting.getMeetingName();
+					 principalId = payMeeting.getDirectorId();
+				 } else if (GlobalConstants.FORE.equals(one.getProjectType())) {
+					 PayMemberProjectSubitem payMemberProjectSubitemOld = payMemberProjectSubitemService.getById(one.getProjectId());
+					 if(Objects.isNull(payMemberProjectSubitemOld)){
+						 throw new JeroBootException("项目不存在！");
+					 }
+					 PayMemberProject payMemberProject = memberProjectService.getById(payMemberProjectSubitemOld.getProjectId());
+					 if(Objects.isNull(payMemberProject)){
+						 throw new JeroBootException("会员项目不存在！");
+					 }
+					 PayContactsManagementTemporary memberTemporary = payContactsManagementTemporaryService.getById(payMemberProjectSubitemOld.getCompanyContactTemporaryId());
+					 if(!Objects.isNull(memberTemporary)){
+						 listId.add(memberTemporary);
+					 }
+					 project = payMemberProject.getProjectName();
+					 principalId = payMemberProject.getDirectorId();
+				 } else if (GlobalConstants.FIVE.equals(one.getProjectType())) {
+					 TbMemberProjectSubitem tbMemberProjectSubitemOld = tbMemberProjectSubitemService.getById(one.getProjectId());
+					 if(Objects.isNull(tbMemberProjectSubitemOld)){
+						 throw new JeroBootException("标协会员成员不存在！");
+					 }
+					 TbMemberProject tbMemberProject = tbMemberProjectService.getById(tbMemberProjectSubitemOld.getProjectId());
+					 if(Objects.isNull(tbMemberProject)){
+						 throw new JeroBootException("标协会员不存在！");
+					 }
+					 project = tbMemberProject.getProjectName();
+					 principalId = tbMemberProject.getDirectorId();
+
+					 PayContactsManagement tbMemberPayContactsManagement = payContactsManagementService.getById(tbMemberProjectSubitemOld.getLiaisonManId());
+					 if(!Objects.isNull(tbMemberPayContactsManagement)){
+						 String str = JSON.toJSONString(tbMemberPayContactsManagement);
+						 PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
+						 listId.add(meetingTemporary);
+					 }
+					 //推送邮寄数据到会员系统
+					 payMailBillService.pushBillEditToStandards(payMailBill);
+				 }
+				 // 发送给项目负责人
+				 if (!StringUtils.isBlank(principalId)) {
+					 SysUser sysUserInfo = sysUserService.getById(principalId);
+					 // 发送消息
+					 SendMessageDTO sendMessageDTO = new SendMessageDTO();
+					 if(!org.apache.commons.lang3.StringUtils.isBlank(sysUserInfo.getEmail())){
+						 sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserInfo.getEmail()));
+					 }
+					 if(!org.apache.commons.lang3.StringUtils.isEmpty(sysUserInfo.getPhone())){
+						 sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserInfo.getPhone()));
+					 }
+					 HashMap<String,String> map = new HashMap<>();
+					 map.put("projectName",project);
+					 sendMessageDTO.setFromUser(sysUser.getUsername());
+					 sendMessageDTO.setToUser(sysUserInfo.getUsername());
+					 sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG13.getCode());
+					 sendMessageDTO.setTemplateParam(map);
+					 sendMessageDTO.setBusType("M_OPEN_TYPE13");
+					 JSONObject json = new JSONObject();
+					 json.put("id",one.getProjectId());
+					 sendMessageDTO.setBusId(json.toJSONString());
+					 sendMessageService.SendMessageService(sendMessageDTO);
+				 }
+				 if(!CollectionUtils.isEmpty(listId)){
+					 String finalProject = project;
+					 listId.forEach(p->{
+						 // 发送消息
+						 SendMessageDTO sendMessageDTO = new SendMessageDTO();
+						 if(!org.apache.commons.lang3.StringUtils.isBlank(p.getEmail())){
+							 sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
+						 }
+						 if(!org.apache.commons.lang3.StringUtils.isEmpty(p.getPhone())){
+							 sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
+							 sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
+						 }
+						 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+						 HashMap<String,String> map = new HashMap<>();
+						 map.put("projectName", finalProject);
+						 sendMessageDTO.setFromUser(sysUser.getUsername());
+						 sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG9.getCode());
+						 sendMessageDTO.setTemplateParam(map);
+						 sendMessageDTO.setBusType("C_OPEN_TYPE9");
+						 JSONObject json = new JSONObject();
+						 json.put("id",one.getProjectId());
+						 sendMessageDTO.setBusId(json.toJSONString());
+						 sendMessageService.SendMessageService(sendMessageDTO);
+					 });
+				 }
+			 }
+		 }
 		 return Result.OK("操作成功!");
 	 }
 	
@@ -209,236 +361,236 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
 		queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId());
 		List<PayMailBillProject> list1 = payMailBillProjectService.list(queryPayMailBillProject);
-			for(PayMailBillProject one:list1) {
-				if (ObjectUtils.isNotEmpty(one)) {
-					LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProjectTwo = new LambdaQueryWrapper<>();
-					queryPayMailBillProjectTwo.eq(PayMailBillProject::getProjectId, one.getProjectId());
-					List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProjectTwo);
+		for(PayMailBillProject one:list1) {
+			if (ObjectUtils.isNotEmpty(one)) {
+				LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProjectTwo = new LambdaQueryWrapper<>();
+				queryPayMailBillProjectTwo.eq(PayMailBillProject::getProjectId, one.getProjectId());
+				List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProjectTwo);
 
-					// 开票金额
-					BigDecimal invoice = new BigDecimal("0.00");
-					// 开票次数
-					int c = listPayMailBillProject.size();
-					// 邮寄次数
-					int y = 0;
-					if (!CollectionUtils.isEmpty(listPayMailBillProject)) {
-						BigDecimal b = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-						invoice = invoice.add(b);
-						List<String> list = listPayMailBillProject.stream().map(PayMailBillProject::getBillId).collect(Collectors.toList());
-						LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
-						queryPayMailBill.in(PayMailBill::getId, list);
-						queryPayMailBill.eq(PayMailBill::getPostStatus, ProjectCommon.POST_STATUS1);
-						List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
-						y = listPayMailBill.size();
+				// 开票金额
+				BigDecimal invoice = new BigDecimal("0.00");
+				// 开票次数
+				int c = listPayMailBillProject.size();
+				// 邮寄次数
+				int y = 0;
+				if (!CollectionUtils.isEmpty(listPayMailBillProject)) {
+					BigDecimal b = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+					invoice = invoice.add(b);
+					List<String> list = listPayMailBillProject.stream().map(PayMailBillProject::getBillId).collect(Collectors.toList());
+					LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
+					queryPayMailBill.in(PayMailBill::getId, list);
+					queryPayMailBill.eq(PayMailBill::getPostStatus, ProjectCommon.POST_STATUS1);
+					List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
+					y = listPayMailBill.size();
+				}
+				//获取项目应收金额
+				BigDecimal receivableAmount = new BigDecimal("0.00");
+
+				String project = "";
+				String principalId = "";
+				List<PayContactsManagementTemporary> listId = new ArrayList<>();
+				//判断变更那个项目的邮寄状态
+				if (GlobalConstants.ONE.equals(one.getProjectType())) {
+					PayCommonProject payCommonProjectOld = payCommonProjectService.getById(one.getProjectId());
+					if(Objects.isNull(payCommonProjectOld)){
+						throw new JeroBootException("项目不存在！");
 					}
-					//获取项目应收金额
-					BigDecimal receivableAmount = new BigDecimal("0.00");
-
-					String project = "";
-					String principalId = "";
-					List<PayContactsManagementTemporary> listId = new ArrayList<>();
-					//判断变更那个项目的邮寄状态
-					if (GlobalConstants.ONE.equals(one.getProjectType())) {
-						PayCommonProject payCommonProjectOld = payCommonProjectService.getById(one.getProjectId());
-						if(Objects.isNull(payCommonProjectOld)){
-							throw new JeroBootException("项目不存在！");
-						}
-						PayContactsManagementTemporary payCommonProjectTemporary = payContactsManagementTemporaryService.getById(payCommonProjectOld.getContactsTemporaryId());
-						if(!Objects.isNull(payCommonProjectTemporary)){
-							listId.add(payCommonProjectTemporary);
-						}
-						project = payCommonProjectOld.getChargeProject();
-						principalId = payCommonProjectOld.getPrincipalId();
-
-						receivableAmount = payCommonProjectOld.getReceivableAmount();
-						PayCommonProject payCommonProject = new PayCommonProject();
-						if (receivableAmount.compareTo(invoice) == 0 && c == y) {
-							payCommonProject.setId(one.getProjectId());
-							payCommonProject.setMail(constant.ONE);
-							payCommonProjectService.updateById(payCommonProject);
-						} else if (y <= c && y > 0) {
-							payCommonProject.setId(one.getProjectId());
-							payCommonProject.setMail(constant.TWO);
-							payCommonProjectService.updateById(payCommonProject);
-						}
-					} else if (GlobalConstants.TWO.equals(one.getProjectType())) {
-						PayWorkingGroupSubItem payWorkingGroupSubItemOld = payWorkingGroupSubItemService.getById(one.getProjectId());
-						if(Objects.isNull(payWorkingGroupSubItemOld)){
-							throw new JeroBootException("项目不存在！");
-						}
-						PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItemOld.getWorkingGroupId());
-						if(Objects.isNull(payWorkingGroup)){
-							throw new JeroBootException("工作组不存在！");
-						}
-						PayContactsManagementTemporary payWorkingTemporaryOne = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdOne());
-						if(!Objects.isNull(payWorkingTemporaryOne)){
-							listId.add(payWorkingTemporaryOne);
-						}
-						if(!org.apache.commons.lang3.StringUtils.isBlank(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo())){
-							PayContactsManagementTemporary payWorkingTemporaryTwo = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo());
-							if(!Objects.isNull(payWorkingTemporaryTwo)){
-								listId.add(payWorkingTemporaryTwo);
-							}
-						}
-						if(!org.apache.commons.lang3.StringUtils.isBlank(payWorkingGroupSubItemOld.getContactsTemporaryIdThree())){
-							PayContactsManagementTemporary payWorkingTemporaryThree = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdThree());
-							if(!Objects.isNull(payWorkingTemporaryThree)){
-								listId.add(payWorkingTemporaryThree);
-							}
-						}
-						project = payWorkingGroup.getWorkingGroupProject();
-						principalId = payWorkingGroup.getPrincipalIdA();
-
-
-						receivableAmount = payWorkingGroupSubItemOld.getReceivableAmount();
-						PayWorkingGroupSubItem payWorkingGroupSubItem = new PayWorkingGroupSubItem();
-						if (receivableAmount.compareTo(invoice) == 0 && c == y) {
-							payWorkingGroupSubItem.setId(one.getProjectId());
-							payWorkingGroupSubItem.setMail(constant.ONE);
-							payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
-						} else if (y <= c && y > 0) {
-							payWorkingGroupSubItem.setId(one.getProjectId());
-							payWorkingGroupSubItem.setMail(constant.TWO);
-							payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
-						}
-					} else if (GlobalConstants.THERE.equals(one.getProjectType())) {
-						PayMeetingSituation meetingPayContactsManagementOld = payMeetingSituationService.getById(one.getProjectId());
-						if(Objects.isNull(meetingPayContactsManagementOld)){
-							throw new JeroBootException("项目不存在！");
-						}
-						PayMeeting payMeeting = payMeetingService.getById(meetingPayContactsManagementOld.getMeetingId());
-						if(Objects.isNull(payMeeting)){
-							throw new JeroBootException("会议不存在！");
-						}
-						PayContactsManagement meetingPayContactsManagement = payContactsManagementService.getById(meetingPayContactsManagementOld.getContractId());
-						if(!Objects.isNull(meetingPayContactsManagement)){
-							String str = JSON.toJSONString(meetingPayContactsManagement);
-							PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
-							listId.add(meetingTemporary);
-						}
-						project = payMeeting.getMeetingName();
-						principalId = payMeeting.getDirectorId();
-
-						receivableAmount = meetingPayContactsManagementOld.getAmountReceivable();
-						PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
-						if (receivableAmount.compareTo(invoice) == 0 && c == y) {
-							payMeetingSituation.setId(one.getProjectId());
-							payMeetingSituation.setMail(constant.ONE);
-							payMeetingSituationService.updateById(payMeetingSituation);
-						} else if (y <= c && y > 0) {
-							payMeetingSituation.setId(one.getProjectId());
-							payMeetingSituation.setMail(constant.TWO);
-							payMeetingSituationService.updateById(payMeetingSituation);
-						}
-					} else if (GlobalConstants.FORE.equals(one.getProjectType())) {
-						PayMemberProjectSubitem payMemberProjectSubitemOld = payMemberProjectSubitemService.getById(one.getProjectId());
-						if(Objects.isNull(payMemberProjectSubitemOld)){
-							throw new JeroBootException("项目不存在！");
-						}
-						PayMemberProject payMemberProject = memberProjectService.getById(payMemberProjectSubitemOld.getProjectId());
-						if(Objects.isNull(payMemberProject)){
-							throw new JeroBootException("会员项目不存在！");
-						}
-						PayContactsManagementTemporary memberTemporary = payContactsManagementTemporaryService.getById(payMemberProjectSubitemOld.getCompanyContactTemporaryId());
-						if(!Objects.isNull(memberTemporary)){
-							listId.add(memberTemporary);
-						}
-						project = payMemberProject.getProjectName();
-						principalId = payMemberProject.getDirectorId();
-
-						receivableAmount = payMemberProjectSubitemOld.getAmountReceivable();
-						PayMemberProjectSubitem payMemberProjectSubitem = new PayMemberProjectSubitem();
-						if (receivableAmount.compareTo(invoice) == 0 && c == y) {
-							payMemberProjectSubitem.setId(one.getProjectId());
-							payMemberProjectSubitem.setMail(constant.ONE);
-							payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
-						} else if (y <= c && y > 0) {
-							payMemberProjectSubitem.setId(one.getProjectId());
-							payMemberProjectSubitem.setMail(constant.TWO);
-							payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
-						}
-					} else if (GlobalConstants.FIVE.equals(one.getProjectType())) {
-						TbMemberProjectSubitem tbMemberProjectSubitemOld = tbMemberProjectSubitemService.getById(one.getProjectId());
-						if(Objects.isNull(tbMemberProjectSubitemOld)){
-							throw new JeroBootException("标协会员成员不存在！");
-						}
-						TbMemberProject tbMemberProject = tbMemberProjectService.getById(tbMemberProjectSubitemOld.getProjectId());
-						if(Objects.isNull(tbMemberProject)){
-							throw new JeroBootException("标协会员不存在！");
-						}
-						project = tbMemberProject.getProjectName();
-						principalId = tbMemberProject.getDirectorId();
-
-						PayContactsManagement tbMemberPayContactsManagement = payContactsManagementService.getById(tbMemberProjectSubitemOld.getLiaisonManId());
-						if(!Objects.isNull(tbMemberPayContactsManagement)){
-							String str = JSON.toJSONString(tbMemberPayContactsManagement);
-							PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
-							listId.add(meetingTemporary);
-						}
-						receivableAmount = tbMemberProjectSubitemOld.getAmountReceivable();
-						TbMemberProjectSubitem tbMemberProjectSubitem = new TbMemberProjectSubitem();
-						if (receivableAmount.compareTo(invoice) == 0 && c == y) {
-							tbMemberProjectSubitem.setId(one.getProjectId());
-							tbMemberProjectSubitem.setMail(constant.ONE);
-							tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
-						} else if (y <= c && y > 0) {
-							tbMemberProjectSubitem.setId(one.getProjectId());
-							tbMemberProjectSubitem.setMail(constant.TWO);
-							tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
-						}
-						//推送邮寄数据到会员系统
-						payMailBillService.pushSendToStandards(payMailBill, one.getProjectId());
+					PayContactsManagementTemporary payCommonProjectTemporary = payContactsManagementTemporaryService.getById(payCommonProjectOld.getContactsTemporaryId());
+					if(!Objects.isNull(payCommonProjectTemporary)){
+						listId.add(payCommonProjectTemporary);
 					}
-					// 发送给项目负责人
-					if (!StringUtils.isBlank(principalId)) {
-						SysUser sysUserInfo = sysUserService.getById(principalId);
+					project = payCommonProjectOld.getChargeProject();
+					principalId = payCommonProjectOld.getPrincipalId();
+
+					receivableAmount = payCommonProjectOld.getReceivableAmount();
+					PayCommonProject payCommonProject = new PayCommonProject();
+					if (receivableAmount.compareTo(invoice) == 0 && c == y) {
+						payCommonProject.setId(one.getProjectId());
+						payCommonProject.setMail(constant.ONE);
+						payCommonProjectService.updateById(payCommonProject);
+					} else if (y <= c && y > 0) {
+						payCommonProject.setId(one.getProjectId());
+						payCommonProject.setMail(constant.TWO);
+						payCommonProjectService.updateById(payCommonProject);
+					}
+				} else if (GlobalConstants.TWO.equals(one.getProjectType())) {
+					PayWorkingGroupSubItem payWorkingGroupSubItemOld = payWorkingGroupSubItemService.getById(one.getProjectId());
+					if(Objects.isNull(payWorkingGroupSubItemOld)){
+						throw new JeroBootException("项目不存在！");
+					}
+					PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItemOld.getWorkingGroupId());
+					if(Objects.isNull(payWorkingGroup)){
+						throw new JeroBootException("工作组不存在！");
+					}
+					PayContactsManagementTemporary payWorkingTemporaryOne = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdOne());
+					if(!Objects.isNull(payWorkingTemporaryOne)){
+						listId.add(payWorkingTemporaryOne);
+					}
+					if(!org.apache.commons.lang3.StringUtils.isBlank(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo())){
+						PayContactsManagementTemporary payWorkingTemporaryTwo = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo());
+						if(!Objects.isNull(payWorkingTemporaryTwo)){
+							listId.add(payWorkingTemporaryTwo);
+						}
+					}
+					if(!org.apache.commons.lang3.StringUtils.isBlank(payWorkingGroupSubItemOld.getContactsTemporaryIdThree())){
+						PayContactsManagementTemporary payWorkingTemporaryThree = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdThree());
+						if(!Objects.isNull(payWorkingTemporaryThree)){
+							listId.add(payWorkingTemporaryThree);
+						}
+					}
+					project = payWorkingGroup.getWorkingGroupProject();
+					principalId = payWorkingGroup.getPrincipalIdA();
+
+
+					receivableAmount = payWorkingGroupSubItemOld.getReceivableAmount();
+					PayWorkingGroupSubItem payWorkingGroupSubItem = new PayWorkingGroupSubItem();
+					if (receivableAmount.compareTo(invoice) == 0 && c == y) {
+						payWorkingGroupSubItem.setId(one.getProjectId());
+						payWorkingGroupSubItem.setMail(constant.ONE);
+						payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
+					} else if (y <= c && y > 0) {
+						payWorkingGroupSubItem.setId(one.getProjectId());
+						payWorkingGroupSubItem.setMail(constant.TWO);
+						payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
+					}
+				} else if (GlobalConstants.THERE.equals(one.getProjectType())) {
+					PayMeetingSituation meetingPayContactsManagementOld = payMeetingSituationService.getById(one.getProjectId());
+					if(Objects.isNull(meetingPayContactsManagementOld)){
+						throw new JeroBootException("项目不存在！");
+					}
+					PayMeeting payMeeting = payMeetingService.getById(meetingPayContactsManagementOld.getMeetingId());
+					if(Objects.isNull(payMeeting)){
+						throw new JeroBootException("会议不存在！");
+					}
+					PayContactsManagement meetingPayContactsManagement = payContactsManagementService.getById(meetingPayContactsManagementOld.getContractId());
+					if(!Objects.isNull(meetingPayContactsManagement)){
+						String str = JSON.toJSONString(meetingPayContactsManagement);
+						PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
+						listId.add(meetingTemporary);
+					}
+					project = payMeeting.getMeetingName();
+					principalId = payMeeting.getDirectorId();
+
+					receivableAmount = meetingPayContactsManagementOld.getAmountReceivable();
+					PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
+					if (receivableAmount.compareTo(invoice) == 0 && c == y) {
+						payMeetingSituation.setId(one.getProjectId());
+						payMeetingSituation.setMail(constant.ONE);
+						payMeetingSituationService.updateById(payMeetingSituation);
+					} else if (y <= c && y > 0) {
+						payMeetingSituation.setId(one.getProjectId());
+						payMeetingSituation.setMail(constant.TWO);
+						payMeetingSituationService.updateById(payMeetingSituation);
+					}
+				} else if (GlobalConstants.FORE.equals(one.getProjectType())) {
+					PayMemberProjectSubitem payMemberProjectSubitemOld = payMemberProjectSubitemService.getById(one.getProjectId());
+					if(Objects.isNull(payMemberProjectSubitemOld)){
+						throw new JeroBootException("项目不存在！");
+					}
+					PayMemberProject payMemberProject = memberProjectService.getById(payMemberProjectSubitemOld.getProjectId());
+					if(Objects.isNull(payMemberProject)){
+						throw new JeroBootException("会员项目不存在！");
+					}
+					PayContactsManagementTemporary memberTemporary = payContactsManagementTemporaryService.getById(payMemberProjectSubitemOld.getCompanyContactTemporaryId());
+					if(!Objects.isNull(memberTemporary)){
+						listId.add(memberTemporary);
+					}
+					project = payMemberProject.getProjectName();
+					principalId = payMemberProject.getDirectorId();
+
+					receivableAmount = payMemberProjectSubitemOld.getAmountReceivable();
+					PayMemberProjectSubitem payMemberProjectSubitem = new PayMemberProjectSubitem();
+					if (receivableAmount.compareTo(invoice) == 0 && c == y) {
+						payMemberProjectSubitem.setId(one.getProjectId());
+						payMemberProjectSubitem.setMail(constant.ONE);
+						payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
+					} else if (y <= c && y > 0) {
+						payMemberProjectSubitem.setId(one.getProjectId());
+						payMemberProjectSubitem.setMail(constant.TWO);
+						payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
+					}
+				} else if (GlobalConstants.FIVE.equals(one.getProjectType())) {
+					TbMemberProjectSubitem tbMemberProjectSubitemOld = tbMemberProjectSubitemService.getById(one.getProjectId());
+					if(Objects.isNull(tbMemberProjectSubitemOld)){
+						throw new JeroBootException("标协会员成员不存在！");
+					}
+					TbMemberProject tbMemberProject = tbMemberProjectService.getById(tbMemberProjectSubitemOld.getProjectId());
+					if(Objects.isNull(tbMemberProject)){
+						throw new JeroBootException("标协会员不存在！");
+					}
+					project = tbMemberProject.getProjectName();
+					principalId = tbMemberProject.getDirectorId();
+
+					PayContactsManagement tbMemberPayContactsManagement = payContactsManagementService.getById(tbMemberProjectSubitemOld.getLiaisonManId());
+					if(!Objects.isNull(tbMemberPayContactsManagement)){
+						String str = JSON.toJSONString(tbMemberPayContactsManagement);
+						PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
+						listId.add(meetingTemporary);
+					}
+					receivableAmount = tbMemberProjectSubitemOld.getAmountReceivable();
+					TbMemberProjectSubitem tbMemberProjectSubitem = new TbMemberProjectSubitem();
+					if (receivableAmount.compareTo(invoice) == 0 && c == y) {
+						tbMemberProjectSubitem.setId(one.getProjectId());
+						tbMemberProjectSubitem.setMail(constant.ONE);
+						tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
+					} else if (y <= c && y > 0) {
+						tbMemberProjectSubitem.setId(one.getProjectId());
+						tbMemberProjectSubitem.setMail(constant.TWO);
+						tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
+					}
+					//推送邮寄数据到会员系统
+					payMailBillService.pushSendToStandards(payMailBill, one.getProjectId());
+				}
+				// 发送给项目负责人
+				if (!StringUtils.isBlank(principalId)) {
+					SysUser sysUserInfo = sysUserService.getById(principalId);
+					// 发送消息
+					SendMessageDTO sendMessageDTO = new SendMessageDTO();
+					if(!org.apache.commons.lang3.StringUtils.isBlank(sysUserInfo.getEmail())){
+						sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserInfo.getEmail()));
+					}
+					if(!org.apache.commons.lang3.StringUtils.isEmpty(sysUserInfo.getPhone())){
+						sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserInfo.getPhone()));
+					}
+					HashMap<String,String> map = new HashMap<>();
+					map.put("projectName",project);
+					sendMessageDTO.setFromUser(sysUser.getUsername());
+					sendMessageDTO.setToUser(sysUserInfo.getUsername());
+					sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG13.getCode());
+					sendMessageDTO.setTemplateParam(map);
+					sendMessageDTO.setBusType("M_OPEN_TYPE13");
+					JSONObject json = new JSONObject();
+					json.put("id",one.getProjectId());
+					sendMessageDTO.setBusId(json.toJSONString());
+					sendMessageService.SendMessageService(sendMessageDTO);
+				}
+				if(!CollectionUtils.isEmpty(listId)){
+					String finalProject = project;
+					listId.forEach(p->{
 						// 发送消息
 						SendMessageDTO sendMessageDTO = new SendMessageDTO();
-						if(!org.apache.commons.lang3.StringUtils.isBlank(sysUserInfo.getEmail())){
-							sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserInfo.getEmail()));
+						if(!org.apache.commons.lang3.StringUtils.isBlank(p.getEmail())){
+							sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
 						}
-						if(!org.apache.commons.lang3.StringUtils.isEmpty(sysUserInfo.getPhone())){
-							sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserInfo.getPhone()));
+						if(!org.apache.commons.lang3.StringUtils.isEmpty(p.getPhone())){
+							sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
+							sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
 						}
+						SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 						HashMap<String,String> map = new HashMap<>();
-						map.put("projectName",project);
+						map.put("projectName", finalProject);
 						sendMessageDTO.setFromUser(sysUser.getUsername());
-						sendMessageDTO.setToUser(sysUserInfo.getUsername());
-						sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG13.getCode());
+						sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG9.getCode());
 						sendMessageDTO.setTemplateParam(map);
-						sendMessageDTO.setBusType("M_OPEN_TYPE13");
+						sendMessageDTO.setBusType("C_OPEN_TYPE9");
 						JSONObject json = new JSONObject();
 						json.put("id",one.getProjectId());
 						sendMessageDTO.setBusId(json.toJSONString());
 						sendMessageService.SendMessageService(sendMessageDTO);
-					}
-					if(!CollectionUtils.isEmpty(listId)){
-						String finalProject = project;
-						listId.forEach(p->{
-							// 发送消息
-							SendMessageDTO sendMessageDTO = new SendMessageDTO();
-							if(!org.apache.commons.lang3.StringUtils.isBlank(p.getEmail())){
-								sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
-							}
-							if(!org.apache.commons.lang3.StringUtils.isEmpty(p.getPhone())){
-								sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
-								sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
-							}
-							SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-							HashMap<String,String> map = new HashMap<>();
-							map.put("projectName", finalProject);
-							sendMessageDTO.setFromUser(sysUser.getUsername());
-							sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG9.getCode());
-							sendMessageDTO.setTemplateParam(map);
-							sendMessageDTO.setBusType("C_OPEN_TYPE9");
-							JSONObject json = new JSONObject();
-							json.put("id",one.getProjectId());
-							sendMessageDTO.setBusId(json.toJSONString());
-							sendMessageService.SendMessageService(sendMessageDTO);
-						});
-					}
+					});
 				}
 			}
+		}
 		return Result.OK("编辑成功!");
 	}