Skip to content

H
haoban-manage3.0
Commit 76c49cde by qwmqiuwenmin
Options

fix

parent a1cd568d
Showing with 59 additions and 18 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/FriendClerkSyncOperation.java
......@@ -83,11 +83,10 @@ public class FriendClerkSyncOperation implements BaseSyncOperation {
dealDepartmentToMq(dataPre.getTaskId(), hashSet, SyncTaskStatusEnum.friend_sync);
}
} catch (Exception e) {
e.printStackTrace();
e.printStackTrace();
logger.info("同步失败：", JSONObject.toJSONString(dataPre));
reason = "成员好友处理异常";
dealFlag = false;
dealException(dealParamMqDTO.getTaskId(), dataPre.getDataId(), null, "处理异常");
}finally {
if (!dealFlag) {
dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), reason);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/FriendMergeSyncOperation.java
package com.gic.haoban.manage.service.task;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.haoban.manage.api.dto.DealParamMqDTO;
import com.gic.haoban.manage.api.dto.ExternalUserDTO;
import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
......@@ -14,20 +17,31 @@ import com.gic.haoban.manage.service.service.PreDealService;
@Service
public class FriendMergeSyncOperation implements BaseSyncOperation{
private static final Logger logger = LoggerFactory.getLogger(FriendMergeSyncOperation.class);
@Autowired
private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
@Autowired
private PreDealService preDealService;
@Override
public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
String dataContent = dataPre.getDataContent();
ExternalUserDTO pojo = JSON.parseObject(dataContent, ExternalUserDTO.class);
String res = memberUnionidRelatedApiService.addExternal(pojo);
if(StringUtils.isBlank(res)){
dealSuccess(dealParamMqDTO.getTaskId(), dataPre.getDataId(), null, null);
}else{
dealException(dealParamMqDTO.getTaskId(), dataPre.getDataId(), null, res);
String reason = "";
boolean dealFlag = true;
try {
String dataContent = dataPre.getDataContent();
ExternalUserDTO pojo = JSON.parseObject(dataContent, ExternalUserDTO.class);
String res = memberUnionidRelatedApiService.addExternal(pojo);
if(StringUtils.isBlank(res)){
dealSuccess(dealParamMqDTO.getTaskId(), dataPre.getDataId(), null, null);
}
} catch (Exception e) {
e.printStackTrace();
logger.info("同步失败：", JSONObject.toJSONString(dataPre));
reason = "合并处理异常";
dealFlag = false;
}finally {
if (!dealFlag) {
dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), reason);
}
}
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/FriendSyncOperation.java
......@@ -53,6 +53,8 @@ public class FriendSyncOperation implements BaseSyncOperation {
private StaffClerkRelationService staffClerkRelationService;
@Override
public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
String reason = "";
boolean dealFlag = true;
String wxEnterpriseId = dataPre.getWxEnterpriseId();
String wxUserId = dataPre.getpDataId();
String taskId = dealParamMqDTO.getTaskId();
......@@ -73,15 +75,28 @@ public class FriendSyncOperation implements BaseSyncOperation {
return;
}
ExternalUserDTO pojo = memberUnionidRelatedApiService.getCorpSelfExternalUseridInfo(wxEnterpriseId,wxUserId, externalUserId);
if(pojo == null){
preDealService.updateStatusByDataId(taskId, externalUserId, PreDealStatusEnum.exception.getVal(), "好友不存在");
return;
}
pojo.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
pojo.setStoreId(mainStore.getStoreId());
pojo.setClerkId(staffClerkRelationDTO.getClerkId());
if(pojo == null){
dealException(taskId, externalUserId, null, "好友不存在");
}else{
if(pojo != null){
dealSuccess(taskId, externalUserId,JSON.toJSONString(pojo),wxEnterpriseId);
}
checkStaffTask(taskId, wxUserId);
try {
checkStaffTask(taskId, wxUserId);
} catch (Exception e) {
e.printStackTrace();
logger.info("同步失败：", JSONObject.toJSONString(dataPre));
reason = "第三方好友处理异常";
dealFlag = false;
}finally {
if (!dealFlag) {
dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), reason);
}
}
}
@Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/SelfFriendSyncOperation.java
......@@ -64,6 +64,8 @@ public class SelfFriendSyncOperation implements BaseSyncOperation{
private MemberOpenCardBusinessService memberOpenCardBusinessService;
@Override
public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
String reason = "";
boolean dealFlag = true;
String wxEnterpriseId = dataPre.getWxEnterpriseId();
String wxUserId = dataPre.getpDataId();
String taskId = dealParamMqDTO.getTaskId();
......@@ -90,7 +92,7 @@ public class SelfFriendSyncOperation implements BaseSyncOperation{
pojo.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
pojo.setStoreId(mainStore.getStoreId());
pojo.setClerkId(staffClerkRelationDTO.getClerkId());
//新增导购和外部联系人关系
String clerkCode = staffClerkRelationDTO.getClerkCode();
ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);
......@@ -111,9 +113,20 @@ public class SelfFriendSyncOperation implements BaseSyncOperation{
if(member == null){
preDealService.updateStatusByDataId(taskId, externalUserId, PreDealStatusEnum.exception.getVal(), "会员不存在");
}
pojo.setMemberId(member.getMemberId());
dealSuccess(taskId, externalUserId,JSON.toJSONString(pojo),wxEnterpriseId);
checkStaffTask(taskId, wxUserId);
try {
pojo.setMemberId(member.getMemberId());
dealSuccess(taskId, externalUserId,JSON.toJSONString(pojo),wxEnterpriseId);
checkStaffTask(taskId, wxUserId);
} catch (Exception e) {
e.printStackTrace();
logger.info("同步失败：", JSONObject.toJSONString(dataPre));
reason = "自建应用好友处理异常";
dealFlag = false;
}finally {
if (!dealFlag) {
dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), reason);
}
}
}
@Override
......
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