同步好友更新标识

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/PreDealLogMapper.java

@@ -192,7 +192,7 @@ public interface PreDealLogMapper {
      * @param dataContent
      * @return
      */
-    int updateFriendStatusAndRelationKeyByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId, @Param("status") int status, @Param("reason") String reason, @Param("dataContent") String dataContent, @Param("relationKey") String relationKey);
+    int updateFriendStatusAndRelationKeyByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId, @Param("status") int status, @Param("reason") String reason, @Param("dataContent") String dataContent, @Param("relationKey") String relationKey , @Param("dataType")  int dataType);
 
     /**
 	 * 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/PreDealService.java

@@ -178,7 +178,7 @@ public interface PreDealService {
      * @param reason
      * @param dataContent
      */
-    public boolean updateFriendStatusByDataId(String taskId, String dataId, int status, String reason, String dataContent, String relationKey);
+    public boolean updateFriendStatusByDataId(String taskId, String dataId, int status, String reason, String dataContent, String relationKey , int type);
 
     /**
 	 * 根据父任务判断子任务是否全部完成

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/PreDealServiceImpl.java

@@ -171,8 +171,8 @@ public class PreDealServiceImpl implements PreDealService {
     }
 
     @Override
-    public boolean updateFriendStatusByDataId(String taskId, String dataId, int status, String reason, String dataContent, String relationKey) {
-        int i = preDealLogMapper.updateFriendStatusAndRelationKeyByDataId(taskId, dataId, status, reason, dataContent, relationKey);
+    public boolean updateFriendStatusByDataId(String taskId, String dataId, int status, String reason, String dataContent, String relationKey , int type) {
+        int i = preDealLogMapper.updateFriendStatusAndRelationKeyByDataId(taskId, dataId, status, reason, dataContent, relationKey , type);
         return i >= 0;
     }
 

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

@@ -135,7 +135,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
             }
 
             //更新状态
-            preDealService.updateFriendStatusByDataId(taskId, dataPre.getDataId(), PreDealStatusEnum.computed.getVal(), reason, externalUserDTO.getMemberId(), relationKey);
+            preDealService.updateFriendStatusByDataId(taskId, dataPre.getDataId(), PreDealStatusEnum.computed.getVal(), reason, externalUserDTO.getMemberId(), relationKey , PreDealTypeEnum.friend.getVal());
             dealSuccess(taskId, dataPre.getDataId(), dataPre.getpDataId(), wxEnterpriseId);
         } catch (WxApiLimitException e) {
             logger.info("接口次数限制：{}", JSONObject.toJSONString(dataPre));
@@ -250,7 +250,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
     }
 
     public void dealException(String taskId, String dataId, String pDataId, String reason, String relationKey) {
-        preDealService.updateFriendStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal(), reason, null, relationKey);
+        preDealService.updateFriendStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal(), reason, null, relationKey, PreDealTypeEnum.friend.getVal());
         checkDepartmentTask(taskId, pDataId);
     }
 

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

@@ -90,7 +90,7 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
             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);
+            preDealService.updateFriendStatusByDataId(taskId, dataPre.getDataId(), PreDealStatusEnum.computed.getVal(), reason, json.toJSONString(), relationKey , PreDealTypeEnum.self_friend.getVal());
             dealSuccess(taskId, dataPre.getDataId(), null, wxEnterpriseId);
         } catch (WxApiLimitException e) {
             logger.info("接口次数限制：{}", JSONObject.toJSONString(dataPre));
@@ -173,6 +173,7 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
         RedisUtil.setCache(key, pDataId, 30L, TimeUnit.SECONDS);
         List<String> dataIds = preDealService.listReDataIdByPDataId(taskId, pDataId, PreDealTypeEnum.friend.getVal());
         if (CollectionUtils.isEmpty(dataIds)) {
+            logger.info("第三方的数据为空");
             //更新父级别
             preDealService.updateStatusByDataId(taskId, pDataId, PreDealTypeEnum.friend_clerk.getVal(), PreDealStatusEnum.computed.getVal(), "成功");
             //校验异常

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

@@ -368,7 +368,7 @@
             relation_key=#{relationKey},
             update_time = now()
         </set>
-        where data_id = #{dataId,jdbcType=INTEGER} and task_id=#{taskId}
+        where data_id = #{dataId,jdbcType=INTEGER} and task_id=#{taskId} and data_type = #{dataType}
     </update>
     
     <select id="countFailStaffTaskByTaskIdAndPDataId" resultType="integer">