Merge branch 'fixbug_0308' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendSyncNewOperation.java

@@ -110,6 +110,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
                 return;
             }
             //relationkey
+            logger.info("生成relationKey：{},{},{}",staffId,externalUserDTO.getName(),externalUserDTO.getAddCreateTime());
             relationKey = SecureUtil.md5(staffId + "_" + externalUserDTO.getName() + "_" + externalUserDTO.getAddCreateTime());
             logger.info("relationKey：{}，{}", relationKey, externalUserDTO.getExternalUserId());
             // 根据关联键relationkey查看自建应用 是否有数据

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/SelfFriendSyncNewOperation.java

@@ -61,8 +61,8 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
             String taskId = dealParamMqDTO.getTaskId();
             String externalUserId = dataPre.getDataContent();
 
-            ExternalUserDTO pojo = memberUnionidRelatedApiService.getCorpSelfExternalUseridInfo(wxEnterpriseId, wxUserId, externalUserId);
-            if (pojo == null) {
+            ExternalUserDTO externalUserDTO = memberUnionidRelatedApiService.getCorpSelfExternalUseridInfo(wxEnterpriseId, wxUserId, externalUserId);
+            if (externalUserDTO == null) {
                 logger.info("外部联系人好友不存在：{}", JSONObject.toJSONString(dataPre));
                 dealException(taskId, dataPre.getDataId(), null, "好友不存在");
                 return;
@@ -76,14 +76,16 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
             String staffId = tabHaobanStaff.getStaffId();
             //自有应用信息
             JSONObject json = new JSONObject();
-            json.put("name", pojo.getName());
-            json.put("unionId", pojo.getUnionId());
-            json.put("avatar", pojo.getAvatar());
-            json.put("externalUserId", pojo.getExternalUserId());
-            json.put("addCreateTime", pojo.getAddCreateTime());
+            json.put("name", externalUserDTO.getName());
+            json.put("unionId", externalUserDTO.getUnionId());
+            json.put("avatar", externalUserDTO.getAvatar());
+            json.put("externalUserId", externalUserDTO.getExternalUserId());
+            json.put("addCreateTime", externalUserDTO.getAddCreateTime());
 
             //relationkey
-            String relationKey = SecureUtil.md5(staffId + "_" + pojo.getName() + "_" + pojo.getAddCreateTime());
+            logger.info("生成relationKey：{},{},{}",staffId,externalUserDTO.getName(),externalUserDTO.getAddCreateTime());
+            String relationKey = SecureUtil.md5(staffId + "_" + externalUserDTO.getName() + "_" + externalUserDTO.getAddCreateTime());
+            logger.info("relationKey：{}，{}", relationKey, externalUserDTO.getExternalUserId());
             //更新状态
             preDealService.updateFriendStatusByDataId(taskId, dataPre.getDataId(), PreDealStatusEnum.computed.getVal(), reason, json.toJSONString(), relationKey);
             dealSuccess(taskId, dataPre.getDataId(), null, wxEnterpriseId);