Commit 0bc5b2cf by qwmqiuwenmin

fix

parent ae4269a7
......@@ -125,17 +125,17 @@ public class FriendSyncOperation implements BaseSyncOperation {
for (TabHaobanPreDealLog tabHaobanPreDealLog : list) {
String dataContent = tabHaobanPreDealLog.getDataContent();
if(StringUtils.isNotBlank(dataContent)){
JSONObject json = JSON.parseObject(dataContent);
ExternalUserDTO json = JSON.parseObject(dataContent, ExternalUserDTO.class);
String addCreateTime = json.getString("addCreateTime");
String name = json.getString("name");
String addCreateTime = json.getAddCreateTime();
String name = json.getName();
String key = addCreateTime + name;
String unionId = json.getString("unionId");
String clerkId = json.getString("clerkId");
String enterpriseId = json.getString("enterpriseId");
String memberId = json.getString("memberId");
String storeId = json.getString("storeId");
String wxEnterpriseId = json.getString("wxEnterpriseId");
String unionId = json.getUnionId();
String clerkId = json.getClerkId();
String enterpriseId = json.getEnterpriseId();
String memberId = json.getMemberId();
String storeId = json.getStoreId();
String wxEnterpriseId = json.getWxEnterpriseId();
ExternalUserDTO dto = map.get(key);
if(dto != null){
......@@ -148,19 +148,19 @@ public class FriendSyncOperation implements BaseSyncOperation {
}else if(tabHaobanPreDealLog.getDataType() == SyncTaskStatusEnum.friend_sync.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));
......
......@@ -164,16 +164,16 @@ public class SelfFriendSyncOperation implements BaseSyncOperation{
for (TabHaobanPreDealLog tabHaobanPreDealLog : list) {
String dataContent = tabHaobanPreDealLog.getDataContent();
if(StringUtils.isNotBlank(dataContent)){
JSONObject json = JSON.parseObject(dataContent);
String addCreateTime = json.getString("addCreateTime");
String name = json.getString("name");
ExternalUserDTO json = JSON.parseObject(dataContent, ExternalUserDTO.class);
String addCreateTime = json.getAddCreateTime();
String name = json.getName();
String key = addCreateTime + name;
String unionId = json.getString("unionId");
String clerkId = json.getString("clerkId");
String enterpriseId = json.getString("enterpriseId");
String memberId = json.getString("memberId");
String storeId = json.getString("storeId");
String wxEnterpriseId = json.getString("wxEnterpriseId");
String unionId = json.getUnionId();
String clerkId = json.getClerkId();
String enterpriseId = json.getEnterpriseId();
String memberId = json.getMemberId();
String storeId = json.getStoreId();
String wxEnterpriseId = json.getWxEnterpriseId();
ExternalUserDTO dto = map.get(key);
if(dto != null){
......@@ -242,7 +242,8 @@ 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"));
String res = "{'clerkId':'b160eb9a3daf4b3da936b678f1b06744','enterpriseId':'ff8080815dacd3a2015dacd3ef5c0000','externalUserId':'wm59NLDQAAY5Q4pABXAfaTJ6mORvpw','name':'hzw','storeId':'ff8080815695df44015697ada25b0102','wxEnterpriseId':'ca66a01b79474c40b3e7c7f93";
System.err.println(JSON.parseObject(res, ExternalUserDTO.class));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment