fix

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

@@ -869,7 +869,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 					if(uj_userId.equals(wxUserId)){
 						if(jt != null){
 							externalUserId = jt.getString("external_userid");
-							createTime = jt.getString("createtime");
+							createTime = follow.getString("createtime");
 							break;
 						}
 					}

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

@@ -165,7 +165,6 @@ public class SelfFriendSyncOperation implements BaseSyncOperation{
 					String dataContent = tabHaobanPreDealLog.getDataContent();
 					if(StringUtils.isNotBlank(dataContent)){
 						JSONObject json = JSON.parseObject(dataContent);
-						
 						String addCreateTime = json.getString("addCreateTime");
 						String name = json.getString("name");
 						String key = addCreateTime + name;
@@ -187,20 +186,20 @@ public class SelfFriendSyncOperation implements BaseSyncOperation{
 							}else if(tabHaobanPreDealLog.getDataType() == PreDealTypeEnum.friend.getVal()){
 								dto.setExternalUserId(tabHaobanPreDealLog.getDataId());
 							}
+							TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
+				            dealLog.setDataId(key);
+				            dealLog.setpDataId(wxUserId);
+				            dealLog.setDataType(PreDealTypeEnum.friend_merge.getVal());
+				            dealLog.setStatusFlag(0);
+				            dealLog.setTaskId(taskId);
+				            dealLog.setDataContent(JSONObject.toJSONString(dto));
+				            dealLog.setWxEnterpriseId(wxEnterpriseId);
+				            dealLogList.add(dealLog);
 						}else{
 							ExternalUserDTO dto2 = JSON.parseObject(dataContent, ExternalUserDTO.class);
 							map.put(key, dto2);
 						}
 						
-						TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
-			            dealLog.setDataId(key);
-			            dealLog.setpDataId(wxUserId);
-			            dealLog.setDataType(PreDealTypeEnum.friend_merge.getVal());
-			            dealLog.setStatusFlag(0);
-			            dealLog.setTaskId(taskId);
-			            dealLog.setDataContent(JSONObject.toJSONString(dto));
-			            dealLog.setWxEnterpriseId(wxEnterpriseId);
-			            dealLogList.add(dealLog);
 					}
 				}
 				logger.info("dealLogList={}",JSON.toJSONString(dealLogList));
@@ -241,5 +240,9 @@ public class SelfFriendSyncOperation implements BaseSyncOperation{
             }
         });
     }
+    
+    public static void main(String[] args) {
+		System.err.println(JSON.parseObject("{'clerkId':'b160eb9a3daf4b3da936b678f1b06744','enterpriseId':'ff8080815dacd3a2015dacd3ef5c0000','externalUserId':'wm59NLDQAAY5Q4-pAB-XAfaTJ6mORvpw','name':'hzw','storeId':'ff8080815695df44015697ada25b0102','wxEnterpriseId':'ca66a01b79474c40b3e7c7f93"));
+	}
 
 }