消息推送新增app端

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -504,6 +504,9 @@ public class KwcContractLogisticsService {
         if (kwcContractLogisticsMapper.updateById(kwcContractLogistic) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
+
+        kwcContractLogisticsTrackService.saveContractLogisticsTrack(kwcContractLogistic.getId(), ContractTrackEnum.OVER.getCode());
+
     }
 
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -20,6 +20,7 @@ import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ContractStatusEnum;
+import com.sckw.core.model.enums.ContractTrackEnum;
 import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
@@ -569,12 +570,7 @@ public class KwcContractTradeService {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
 
-        //完结相关订单
-        ContractSignCompletedParam contractSignCompletedParam = new ContractSignCompletedParam();
-        contractSignCompletedParam.setContractId(kwcContractTrade.getContractPid());
-        contractSignCompletedParam.setUpdateBy(LoginUserHolder.getUserId());
-        contractSignCompletedParam.setUpdateByName(LoginUserHolder.getUserName());
-        tradeOrderInfoService.contractSignCompleted(contractSignCompletedParam);
+        kwcContractTradeTrackService.saveContractTradeTrack(kwcContractTrade.getId(), ContractTrackEnum.OVER.getCode());
     }
 
 

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/CommonBusinessService.java

@@ -3,6 +3,7 @@ package com.sckw.manage.service;
 import com.alibaba.fastjson2.JSON;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.ClientTypeEnum;
 import com.sckw.core.model.enums.CooperateStatusEnum;
 import com.sckw.core.model.enums.CooperateTypeEnum;
 import com.sckw.core.utils.AsyncThreadUtils;
@@ -367,12 +368,18 @@ public class CommonBusinessService {
     }
 
 
-    public void sendSystemMessage(List<UserInfo> userInfos, MessageEnum messageEnum, Map<String, Object> map, String msgUrl) {
+    public void sendSystemMessage(List<UserInfo> userInfos, MessageEnum messageEnum, Map<String, Object> map, String msgUrl, String appMsgUrl) {
         SckwMessage msg = new SckwMessage();
+        Map<String, String> msgUrls = new HashMap<>(Global.NUMERICAL_FOUR);
+        msgUrls.put(ClientTypeEnum.pc.getValue(), msgUrl);
+        if (StringUtils.isNotBlank(appMsgUrl)) {
+            msgUrls.put(ClientTypeEnum.app.getValue(), appMsgUrl);
+        }
+
         msg.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(messageEnum)
                 .setParams(map)
-                .setMsgUrl(msgUrl)
+                .setMsgUrls(msgUrls)
                 .setUserInfos(userInfos)
                 .setCreateBy(LoginUserHolder.getUserId());
         AsyncThreadUtils.submit(new AsyncProcess(msg, streamBridge));

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -444,16 +444,4 @@ public class KwmAddressService {
         return addressDetailResVo;
     }
 
-    public void test() {
-        Map<String, Object> map = new HashMap<>();
-        map.put("entName", "测试企业");
-        map.put("createByName", LoginUserHolder.getUserName());
-        commonBusinessService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId())),
-                MessageEnum.SUBMIT_COOPERATE,
-                map,
-                "testUrl");
-
-        String msg = "{\"createBy\":156382319433748480,\"messageEnum\":\"SUBMIT_COOPERATE\",\"msgUrl\":\"testUrl\",\"params\":{\"createByName\":\"楚镇豪-企业管理员\",\"entName\":\"徐长卿\"},\"requestId\":\"cefb6b5357ce48d9a11ffc94da83c879\",\"userInfos\":[{\"entId\":156382319450525696,\"userId\":156382319433748480}]}";
-        streamBridge.send("sckw-message", com.alibaba.fastjson2.JSON.toJSONString(msg));
-    }
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateApplyService.java

@@ -72,6 +72,12 @@ public class KwmCooperateApplyService {
     @Value(value = "${jumpUrl.cooperateApplyUrl}")
     private String cooperateApplyUrl;
 
+    @Value(value = "${jumpUrl.cooperateManageUrl}")
+    private String cooperateManageUrl;
+
+    @Value(value = "${jumpUrl.appCooperateApplyUrl}")
+    private String appCooperateApplyUrl;
+
     /**
      * @param reqVo 分页入参
      * @return HttpResult
@@ -284,7 +290,8 @@ public class KwmCooperateApplyService {
         commonBusinessService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId())),
                 MessageEnum.SUBMIT_COOPERATE,
                 map,
-                cooperateApplyUrl);
+                cooperateApplyUrl,
+                appCooperateApplyUrl);
 
         //合作申请待审核消息
         EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(reqVo.getEntId());
@@ -293,7 +300,8 @@ public class KwmCooperateApplyService {
         commonBusinessService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(entCacheResDto1.getContactsId()).setEntId(entCacheResDto1.getId())),
                 MessageEnum.COOPERATE_WAIT_APPROVAL,
                 map,
-                cooperateApplyUrl);
+                cooperateApplyUrl,
+                appCooperateApplyUrl);
     }
 
 
@@ -534,7 +542,8 @@ public class KwmCooperateApplyService {
                 commonBusinessService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(entCacheResDto.getContactsId()).setEntId(entCacheResDto.getId())),
                         MessageEnum.COOPERATE_PASS,
                         map,
-                        cooperateApplyUrl);
+                        cooperateManageUrl,
+                        appCooperateApplyUrl);
             } else {
                 KwmCooperate kwmCooperate = kwmCooperateMapper.selectById(Long.parseLong(id));
                 EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(kwmCooperate.getEntId());
@@ -543,7 +552,8 @@ public class KwmCooperateApplyService {
                 commonBusinessService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(entCacheResDto.getContactsId()).setEntId(entCacheResDto.getId())),
                         MessageEnum.COOPERATE_REFUSED,
                         map,
-                        cooperateApplyUrl);
+                        cooperateApplyUrl,
+                        appCooperateApplyUrl);
             }
         }
     }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateManageService.java

@@ -85,6 +85,9 @@ public class KwmCooperateManageService {
     @Value(value = "${jumpUrl.cooperateManageUrl}")
     private String cooperateManageUrl;
 
+    @Value(value = "${jumpUrl.appCooperateApplyUrl}")
+    private String appCooperateApplyUrl;
+
     /**
      * @param reqVo 分页入参
      * @return PageResult
@@ -240,26 +243,30 @@ public class KwmCooperateManageService {
                 commonBusinessService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(ourEntTopCacheResDto.getContactsId()).setEntId(ourEntTopCacheResDto.getId())),
                         MessageEnum.COOPERATE_DISSOLVE,
                         map,
-                        cooperateManageUrl);
+                        cooperateManageUrl,
+                        appCooperateApplyUrl);
 
                 map.put("entName", ourEntCacheResDto.getFirmName());
                 commonBusinessService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(targetEntTreeCacheResDto.getContactsId()).setEntId(targetEntTreeCacheResDto.getId())),
                         MessageEnum.COOPERATE_DISSOLVED,
                         map,
-                        cooperateManageUrl);
+                        cooperateManageUrl,
+                        appCooperateApplyUrl);
             } else {
                 map.put("entName", targetEntCacheResDto.getFirmName());
                 map.put("createByName", LoginUserHolder.getUserName());
                 commonBusinessService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(ourEntTopCacheResDto.getContactsId()).setEntId(ourEntTopCacheResDto.getId())),
                         MessageEnum.COOPERATE_RESTORE,
                         map,
-                        cooperateManageUrl);
+                        cooperateManageUrl,
+                        appCooperateApplyUrl);
 
                 map.put("entName", ourEntCacheResDto.getFirmName());
                 commonBusinessService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(targetEntTreeCacheResDto.getContactsId()).setEntId(targetEntTreeCacheResDto.getId())),
                         MessageEnum.COOPERATE_RESTORED,
                         map,
-                        cooperateManageUrl);
+                        cooperateManageUrl,
+                        appCooperateApplyUrl);
             }
 
         }

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

@@ -140,7 +140,9 @@ public class CommonService {
         SckwMessage msg = new SckwMessage();
         Map<String, String> msgUrls = new HashMap<>(Global.NUMERICAL_FOUR);
         msgUrls.put(ClientTypeEnum.pc.getValue(), msgUrl);
-        msgUrls.put(ClientTypeEnum.app.getValue(), appMsgUrl);
+        if (StringUtils.isNotBlank(appMsgUrl)) {
+            msgUrls.put(ClientTypeEnum.app.getValue(), appMsgUrl);
+        }
         msg.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(messageEnum)
                 .setParams(map)

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

@@ -79,9 +79,13 @@ public class KwsEnterpriseService {
     @Value(value = "${jumpUrl.entCertificate}")
     private String entCertificateUrl;
 
-    @Value(value = "${jumpUrl.entCertificate}")
+    @Value(value = "${jumpUrl.appEntCertificate}")
     private String appEntCertificateUrl;
 
+    @Value(value = "${jumpUrl.entDept}")
+    private String entDeptUrl;
+
+
     /**
      * @param params 入库
      * @desc: 单表入库
@@ -373,7 +377,10 @@ public class KwsEnterpriseService {
         }
 
         //子公司不用新建机构、角色等，直接返回
-        if (!Objects.isNull(reqVo.getEntPid())) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("entName", kwsEnterprise.getFirmName());
+        map.put("createByName", kwsEnterprise.getContacts());
+        if (Objects.nonNull(reqVo.getEntPid())) {
             KwsEntDept kwsEntDept = new KwsEntDept();
             kwsEntDept.setEntId(entId);
             kwsEntDept.setEntPid(reqVo.getEntPid());
@@ -381,15 +388,17 @@ public class KwsEnterpriseService {
             if (kwsEntDeptDao.insert(kwsEntDept) <= 0) {
                 throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
             }
-        }
 
-        Map<String, Object> map = new HashMap<>();
-        map.put("entName", kwsEnterprise.getFirmName());
-        map.put("createByName", kwsEnterprise.getContacts());
-        commonService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(userId).setEntId(entId)),
-                MessageEnum.ENT_CERTIFICATE,
-                map,
-                entCertificateUrl,"");
+            commonService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(userId).setEntId(entId)),
+                    MessageEnum.ENT_CERTIFICATE,
+                    map,
+                    entDeptUrl, "");
+        } else {
+            commonService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(userId).setEntId(entId)),
+                    MessageEnum.ENT_CERTIFICATE,
+                    map,
+                    entCertificateUrl, appEntCertificateUrl);
+        }
     }
 
     /**
@@ -484,10 +493,19 @@ public class KwsEnterpriseService {
                 messageEnum = MessageEnum.ENT_DEPT_CERTIFICATE_REFUSED;
             }
         }
-        commonService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(kwsEnterprise.getCreateBy()).setEntId(entId)),
-                messageEnum,
-                map,
-                entCertificateUrl,"");
+
+        if (Objects.isNull(kwsEntDept)) {
+            commonService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(kwsEnterprise.getCreateBy()).setEntId(entId)),
+                    messageEnum,
+                    map,
+                    entCertificateUrl, appEntCertificateUrl);
+        } else {
+            commonService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(kwsEnterprise.getCreateBy()).setEntId(entId)),
+                    messageEnum,
+                    map,
+                    entDeptUrl, "");
+        }
+
     }
 
     /**
@@ -617,14 +635,6 @@ public class KwsEnterpriseService {
 
         //主体机构
         extracted(reqVo, new IdWorker(1L).nextId());
-        Map<String, Object> map = new HashMap<>();
-        map.put("entName", reqVo.getFirmName());
-        map.put("createByName", reqVo.getContacts());
-        commonService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId())),
-                MessageEnum.ENT_DEPT_CERTIFICATE,
-                map,
-                entCertificateUrl,
-                appEntCertificateUrl);
     }