From 96c9a6befa04fc362a6b96dcfae07e08cdc41642 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Mon, 20 Dec 2021 14:58:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/common/enums/MessageUrlEnums.java    |  2 +-
 .../PayContactsManagementController.java      | 31 +++++++++---------
 .../PayContactsManagementServiceImpl.java     | 32 ++++++++++---------
 .../impl/PayPaymentCheckServiceImpl.java      |  8 +++--
 4 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java
index c6ce111f..586add01 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java
@@ -26,7 +26,7 @@ public enum MessageUrlEnums {
     M_OPEN_TYPE12("M_OPEN_TYPE12","component","@comp/ProjectDetailModal"),
     M_OPEN_TYPE13("M_OPEN_TYPE13","component","@comp/ProjectDetailModal"),
     M_OPEN_TYPE14("M_OPEN_TYPE14","url","/contractManagement/RevenueContractDetail"),
-    M_OPEN_TYPE15("M_OPEN_TYPE15","component",""),
+    M_OPEN_TYPE15("M_OPEN_TYPE15","component","@views/financialManagement/arriveAndInvoicing/modules/AuditProofModule"),
     M_OPEN_TYPE16("M_OPEN_TYPE16","url","/contractManagement/RevenueContractDetail"),
     // todo 待定企业端
     C_OPEN_TYPE1("C_OPEN_TYPE1","href",""),
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index ac75f7e3..6b217b7f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -253,20 +253,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		if(Objects.isNull(payContactsManagementOld)){
 			return Result.error("联系人不存在！");
 		}
-		// 企业管理员变更需要同步会员项目
-		if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
-				&& StringUtils.isBlank(payContactsManagement.getFlagStatus())){
-			// 调用会员项目接口
-			MemberInfo memberInfo = new MemberInfo();
-			memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
-			memberInfo.setId(payCompanyManagement.getMemberId());
-			memberInfo.setLiaisonMan(payContactsManagement.getName());
-			memberInfo.setEmail(payContactsManagement.getEmail());
-			memberInfo.setMobile(payContactsManagement.getPhone());
-			memberInfo.setAddress(payContactsManagement.getContactAddress());
-			memberInfo.setPostcode(payContactsManagement.getPostalCode());
-			AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
-		}
+
 		try {
 			String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
 			// 编辑保存联系人前再次校验手机号是否存在
@@ -295,6 +282,21 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 			log.info("联系人管理-编辑异常",e);
 			return Result.error("联系人姓名已存在！");
 		}
+		// 企业管理员变更需要同步会员项目
+		if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
+				&& StringUtils.isBlank(payContactsManagement.getFlagStatus())){
+			// 调用会员项目接口
+			MemberInfo memberInfo = new MemberInfo();
+			memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
+			memberInfo.setId(payCompanyManagement.getMemberId());
+			memberInfo.setLiaisonMan(payContactsManagement.getName());
+			memberInfo.setEmail(payContactsManagement.getEmail());
+			memberInfo.setMobile(payContactsManagement.getPhone());
+			memberInfo.setAddress(payContactsManagement.getContactAddress());
+			memberInfo.setPostcode(payContactsManagement.getPostalCode());
+			AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
+
+		}
 		try {
 			if (!StringUtils.isBlank(payContactsManagement.getPhone())){
 				payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone()));
@@ -327,7 +329,6 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 			updatePayContactsManagement.set(PayContactsManagement::getMemberNature,payContactsManagement.getMemberNature());
 		}
 		payContactsManagementService.update(updatePayContactsManagement);
-		// payContactsManagementService.updateById(payContactsManagement);
 		return Result.OK("编辑成功!");
 	}
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
index bf16e722..e239cd57 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
@@ -133,20 +133,7 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
                 && StringUtils.isBlank(payContactsManagement.getFlagStatus())){
             throw new JeroBootException("手机号不可修改！");
         }
-        // 企业管理员变更需要同步会员项目
-        if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
-                && StringUtils.isBlank(payContactsManagement.getFlagStatus())){
-            // 调用会员项目接口
-            MemberInfo memberInfo = new MemberInfo();
-            memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
-            memberInfo.setId(payCompanyManagement.getMemberId());
-            memberInfo.setLiaisonMan(payContactsManagement.getName());
-            memberInfo.setEmail(payContactsManagement.getEmail());
-            memberInfo.setMobile(payContactsManagement.getPhone());
-            memberInfo.setAddress(payContactsManagement.getContactAddress());
-            memberInfo.setPostcode(payContactsManagement.getPostalCode());
-            AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
-        }
+
         try {
             String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
             // 编辑保存联系人前再次校验手机号是否存在
@@ -175,6 +162,22 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
             log.info("联系人管理-编辑异常",e);
             throw new JeroBootException("联系人姓名已存在！");
         }
+
+        // 企业管理员变更需要同步会员项目
+        if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
+                && StringUtils.isBlank(payContactsManagement.getFlagStatus())){
+            // 调用会员项目接口
+            MemberInfo memberInfo = new MemberInfo();
+            memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
+            memberInfo.setId(payCompanyManagement.getMemberId());
+            memberInfo.setLiaisonMan(payContactsManagement.getName());
+            memberInfo.setEmail(payContactsManagement.getEmail());
+            memberInfo.setMobile(payContactsManagement.getPhone());
+            memberInfo.setAddress(payContactsManagement.getContactAddress());
+            memberInfo.setPostcode(payContactsManagement.getPostalCode());
+            AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
+        }
+
         try {
             if (!StringUtils.isBlank(payContactsManagement.getPhone())){
                 payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone()));
@@ -209,7 +212,6 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
             updatePayContactsManagement.set(PayContactsManagement::getMemberNature,payContactsManagement.getMemberNature());
         }
         update(updatePayContactsManagement);
-//		 payContactsManagementService.updateById(payContactsManagement);
     }
 
     @Override
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 08082613..76594a3f 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
@@ -330,7 +330,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
     private void uploadSendMessage(String principalId,String projectId,String projectName,String projectType){
         // 来款管理者给财务人员发送消息
         List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));
-        if(!CollectionUtils.isEmpty(list)){
+        SysUser sysUser = sysUserService.getById(principalId);
+        if(!CollectionUtils.isEmpty(list) && !Objects.isNull(sysUser)){
             list.forEach(item->{
                 // 发送消息
                 SendMessageDTO sendMessageDTO = new SendMessageDTO();
@@ -348,9 +349,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 sendMessageDTO.setTemplateParam(map);
                 sendMessageDTO.setBusType("M_OPEN_TYPE15");
                 JSONObject json = new JSONObject();
-                json.put("projectId",projectId);
-                json.put("projectName",projectName);
+                json.put("id",projectId);
+                json.put("chargeProject",projectName);
                 json.put("projectType",projectType);
+                json.put("chargeCompanyTemporaryName",sysUser.getRealname());
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
             });