导购刷新好友超时时间

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

@@ -65,6 +65,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
         logger.info("第三方好友合并：{}", JSONObject.toJSONString(dataPre));
         String reason = "成功";
         boolean dealFlag = true;
+        String relationKey = "-1";
         try {
             String wxEnterpriseId = dataPre.getWxEnterpriseId();
             String wxUserId = dataPre.getpDataId();
@@ -78,7 +79,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
                 return;
             }
             //relationkey
-            String relationKey = SecureUtil.md5(wxUserId + "_" + externalUserDTO.getName() + "_" + externalUserDTO.getAddCreateTime());
+            relationKey = SecureUtil.md5(wxUserId + "_" + externalUserDTO.getName() + "_" + externalUserDTO.getAddCreateTime());
             logger.info("relationKey：{}，{}", relationKey, externalUserDTO.getExternalUserId());
             // 根据关联键relationkey查看自建应用 是否有数据
             TabHaobanPreDealLog selfPre = preDealService.getByRelationKey(taskId, PreDealTypeEnum.self_friend.getVal(), relationKey);
@@ -110,7 +111,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
             dealFlag = false;
         } finally {
             if (!dealFlag) {
-                dealException(dealParamMqDTO.getTaskId(), dataPre.getDataId(), dataPre.getpDataId(), reason);
+                dealException(dealParamMqDTO.getTaskId(), dataPre.getDataId(), dataPre.getpDataId(), reason, relationKey);
             }
         }
     }
@@ -167,10 +168,14 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
         return memberUnionidRelatedApiService.addExternal(externalUserDTO);
     }
 
+    public void dealException(String taskId, String dataId, String pDataId, String reason, String relationKey) {
+        preDealService.updateFriendStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal(), reason, null, relationKey);
+        checkDepartmentTask(taskId, pDataId);
+    }
+
     @Override
     public void dealException(String taskId, String dataId, String pDataId, String reason) {
-        preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal(), reason);
-        checkDepartmentTask(taskId, pDataId);
+        return;
     }
 
     @Override

haoban-manage3-service/src/main/resources/mapper/PreDealLogMapper.xml

@@ -362,7 +362,9 @@
 
             status_flag = #{status,jdbcType=INTEGER},
             reason=#{reason},
+            <if test="dataContent !=null">
                 data_content = #{dataContent},
+            </if>
             relation_key=#{relationKey},
             update_time = now()
         </set>