补充企业信息

sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/enums/MessageEnum.java

@@ -108,12 +108,37 @@ public enum MessageEnum {
     /**
      * 合作申请待审核
      */
-    COOPERATE_WAIT_APPROVAL("BUSINESS",
-                            "COOPERATE_WAIT_APPROVAL",
-                            "合作申请待审核",
-                         "【${entName}】对贵司发起了企业合作申请，请前往确认",
-                        "terminal,ios,android"),
+    COOPERATE_WAIT_APPROVAL("BUSINESS", "COOPERATE_WAIT_APPROVAL", "合作申请待审核", "【${entName}】对贵司发起了企业合作申请，请前往确认","terminal,ios,android"),
 
+    /**
+     * 合作申请审核通过
+     */
+    COOPERATE_PASS("BUSINESS", "COOPERATE_PASS", "合作申请审核通过", "贵司发起的与【${entName}有限公司】的合作申请，已通过", "terminal,ios,android"),
+
+    /**
+     * 合作申请审核驳回
+     */
+    COOPERATE_REFUSED("BUSINESS", "COOPERATE_REFUSED", "合作申请审核驳回", "贵司发起的与【${entName}有限公司】的合作申请，已驳回，请及时确认", "terminal,ios,android"),
+
+    /**
+     * 解除合作关系
+     */
+    COOPERATE_DISSOLVE("BUSINESS", "COOPERATE_DISSOLVE", "解除合作关系", "贵司解除了与【${entName}】的合作关系，请及时通知合作单位；操作人：${createByName}", "terminal,ios,android"),
+
+    /**
+     * 合作关系被解除
+     */
+    COOPERATE_DISSOLVED("BUSINESS", "COOPERATE_DISSOLVED", "合作关系被解除", "【${entName}】解除了与贵司的合作关系，请及时联系合作范围并确认", "terminal,ios,android"),
+
+    /**
+     * 恢复合作关系
+     */
+    COOPERATE_RESTORE("BUSINESS", "COOPERATE_RESTORE", "恢复合作关系", "贵司恢复了与【${entName}有限公司】的合作关系，请及时通知合作单位；操作人：${createByName}", "terminal,ios,android"),
+
+    /**
+     * 合作关系被恢复
+     */
+    COOPERATE_RESTORED("BUSINESS", "COOPERATE_RESTORED", "合作关系被恢复", "【${entName}有限公司】恢复了与贵司的合作关系，请及时联系合作范围并确认", "terminal,ios,android"),
 
     /**
      * 托运订单-发起物流托运

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -460,24 +460,24 @@ public class KwsEnterpriseService {
         Map<String, Object> map = new HashMap<>();
         map.put("entName", kwsEnterprise.getFirmName());
         map.put("createByName", LoginUserHolder.getUserName());
-        MessageEnum entCertificatePass;
-        if (Objects.isNull(kwsEntDept)) {
-            entCertificatePass = MessageEnum.ENT_CERTIFICATE_PASS;
-        } else {
-            entCertificatePass = MessageEnum.ENT_DEPT_CERTIFICATE_PASS;
-        }
+        MessageEnum messageEnum;
         if (reqVo.getStatus().equals(ApprovalEnum.OK.getCode())) {
-
-            commonService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(kwsEnterprise.getCreateBy()).setEntId(entId)),
-                    MessageEnum.ENT_CERTIFICATE_PASS,
-                    map,
-                    entCertificateUrl);
+            if (Objects.isNull(kwsEntDept)) {
+                messageEnum = MessageEnum.ENT_CERTIFICATE_PASS;
+            } else {
+                messageEnum = MessageEnum.ENT_DEPT_CERTIFICATE_PASS;
+            }
         } else {
-            commonService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(kwsEnterprise.getCreateBy()).setEntId(entId)),
-                    MessageEnum.ENT_CERTIFICATE_REFUSED,
-                    map,
-                    entCertificateUrl);
+            if (Objects.isNull(kwsEntDept)) {
+                messageEnum = MessageEnum.ENT_CERTIFICATE_REFUSED;
+            } else {
+                messageEnum = MessageEnum.ENT_DEPT_CERTIFICATE_REFUSED;
+            }
         }
+        commonService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(kwsEnterprise.getCreateBy()).setEntId(entId)),
+                messageEnum,
+                map,
+                entCertificateUrl);
     }
 
     /**
@@ -848,6 +848,9 @@ public class KwsEnterpriseService {
                     queryCurrentOrganizationResVo1.setEntId(entCacheResDto1.getId());
                     queryCurrentOrganizationResVo1.setEntName(entCacheResDto1.getFirmName());
                     queryCurrentOrganizationResVo1.setPid(kwsEntDept.getEntPid());
+                    queryCurrentOrganizationResVo1.setContactsId(entCacheResDto1.getContactsId());
+                    queryCurrentOrganizationResVo1.setContacts(entCacheResDto1.getContacts());
+                    queryCurrentOrganizationResVo1.setPhone(entCacheResDto1.getPhone());
                     list.add(queryCurrentOrganizationResVo1);
                 }
             }