Skip to content

H
haoban-manage3.0
Commit 742c9195 by xugaojun
Options

Merge remote-tracking branch 'origin/developer' into developer

parents cd5e0eb7 48ac179b
Showing with 51 additions and 52 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java
......@@ -22,8 +22,19 @@ public interface MemberUnionidRelatedApiService {
MemberUnionidRelatedDTO getByUnionId(String staffId, String memberId);
/**
* 外部联系人新增（加好友）
*
* @param dto
* @return
*/
String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
/**
* 外部联系人删除（删好友）
*
* @param dto
*/
void delMemberUnionidRelated(MemberUnionidRelatedDTO dto);
/**
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
......@@ -128,18 +128,18 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
} else {
operationMap.get("qywxClerkSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
}
}else if(dataPre.getDataType().equals(PreDealTypeEnum.friend_clerk.getVal())){
} else if (dataPre.getDataType().equals(PreDealTypeEnum.friend_clerk.getVal())) {
logger.info("好友导购处理：{}", params);
operationMap.get("friendClerkSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
}else if(dataPre.getDataType().equals(PreDealTypeEnum.friend.getVal())){
} else if (dataPre.getDataType().equals(PreDealTypeEnum.friend.getVal())) {
operationMap.get("friendSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
logger.info("好友处理：{}", params);
}else if(dataPre.getDataType().equals(PreDealTypeEnum.self_friend.getVal())){
} else if (dataPre.getDataType().equals(PreDealTypeEnum.self_friend.getVal())) {
operationMap.get("selfFriendSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
logger.info("好友处理：{}", params);
} else if(dataPre.getDataType().equals(PreDealTypeEnum.friend_merge.getVal())){
} else if (dataPre.getDataType().equals(PreDealTypeEnum.friend_merge.getVal())) {
operationMap.get("friendMergeSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
logger.info("好友合并处理：{}", params);
......@@ -228,7 +228,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
RedisUtil.lock(key, 10L);
String taskLock = getTaskLock(wxEnterpriseId);
if (StringUtils.isNotBlank(taskLock)) {
logger.info("【同步锁】taskLock={}",taskLock);
logger.info("【同步锁】taskLock={}", taskLock);
RedisUtil.unlock(key);
return null;
}
......@@ -307,8 +307,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
eidListMap.forEach((k, v) -> {
//获取所有分组列表
List<StoreGroupDTO> groupDTOList = storeGroupService.listStoreGroupAndChildren(v.toArray(new String[]{}), k);
List<String> hasKey=new ArrayList<>();
List<TabHaobanPreDealLog> dealList = groupDTOList.stream().filter(dto->{
List<String> hasKey = new ArrayList<>();
List<TabHaobanPreDealLog> dealList = groupDTOList.stream().filter(dto -> {
return !hasKey.contains(dto.getStoreGroupId());
}).map(storeGroupDTO -> {
TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
......@@ -451,11 +451,11 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
Date date = DateUtils.addMinutes(new Date(), -30);
Date dayDate = DateUtils.addDays(new Date(), -1);
if (dealLogInfoDTO.getUpdateTime().before(date)
&&syncTask.getUpdateTime().before(date)
&&syncTask.getCreateTime().after(dayDate)) {
logger.info("重试：{}",taskId);
syncTaskService.updateTaskStatus(taskId,SyncTaskStatusEnum.exception_close.getVal());
reDealDepartment(taskId,-1);
&& syncTask.getUpdateTime().before(date)
&& syncTask.getCreateTime().after(dayDate)) {
logger.info("重试：{}", taskId);
syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.exception_close.getVal());
reDealDepartment(taskId, -1);
return syncCheckDTO;
}
......@@ -526,27 +526,16 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
}
}
}
}else if(syncTask.getTaskType().equals(2)){
} else if (syncTask.getTaskType().equals(2)) {
List<PreDealLogInfoDTO> result = page.getResult();
for (PreDealLogInfoDTO dto : result) {
dto.setDataCode(dto.getDataId());
TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(dto.getpDataId(), wxEnterpriseId);
if(staff != null){
if (staff != null) {
dto.setDataName(staff.getStaffName());
}
// if(dto.getDataType() == PreDealTypeEnum.friend.getVal()){
// dto.setDataName("第三方应用处理");
// }else if(dto.getDataType() == PreDealTypeEnum.friend_clerk.getVal()){
// dto.setDataName("导购处理");
// }else if(dto.getDataType() == PreDealTypeEnum.friend_merge.getVal()){
// dto.setDataName("合并处理");
// }else if(dto.getDataType() == PreDealTypeEnum.self_friend.getVal()){
// dto.setDataName("自建应用处理");
// }
//dto.setReason(reason);
}
}
else{
} else {
List<PreDealLogInfoDTO> result = page.getResult();
for (PreDealLogInfoDTO dto : result) {
dto.setDataCode(dto.getDataId());
......@@ -561,16 +550,16 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
public String dealQywxDepartment(String taskId, String wxEnterpriseId) {
WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());
if (null == secretSetting||secretSetting.getCheckFlag()==0) {
if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
logger.info("没有配置secret");
syncTaskService.updateTaskStatus(taskId,SyncTaskStatusEnum.exception_close.getVal());
syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.exception_close.getVal());
unlockTask(wxEnterpriseId);
return "没有配置secret";
}
List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = qywxDepartmentApiService.listSelfDepartment(wxEnterpriseDTO.getCorpid(), secretSetting.getSecretVal(), 1);
if (CollectionUtils.isEmpty(list)) {
logger.info("没有数据同步");
syncTaskService.updateTaskStatus(taskId,SyncTaskStatusEnum.exception_close.getVal());
syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.exception_close.getVal());
unlockTask(wxEnterpriseId);
return "没有数据同步或权限没设置全部";
}
......@@ -607,8 +596,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
if (CollectionUtils.isNotEmpty(staffIds)) {
List<String> delStaffIds = staffService.listDelUserStaffId(wxEnterpriseId, staffIds);
if (CollectionUtils.isEmpty(delStaffIds)) {
logger.info("没有要删除的用户：{}--{}",wxEnterpriseId,taskId);
}else {
logger.info("没有要删除的用户：{}--{}", wxEnterpriseId, taskId);
} else {
staffClerkRelationService.cleanStaffClerk(wxEnterpriseId, delStaffIds);
staffService.cleanStaff(wxEnterpriseId, delStaffIds);
staffDepartmentRelatedService.cleanStaffDepartment(wxEnterpriseId, delStaffIds);
......@@ -619,10 +608,10 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
//清空cleak
if (CollectionUtils.isNotEmpty(groupList)) {
List<String> groupIdList = groupList.stream().map(TabHaobanPreDealLog::getDataId).collect(Collectors.toList());
departmentService.cleanDepartment(wxEnterpriseId,groupIdList);
departmentService.cleanDepartment(wxEnterpriseId, groupIdList);
}
RedisUtil.delLocalCache("department-list-cache-"+wxEnterpriseId);
RedisUtil.delLocalCache("department-list-cache-" + wxEnterpriseId);
}
......@@ -646,8 +635,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
public void dealWxFriendClerk(String taskId, String wxEnterpriseId) {
List<TabHaobanStaffClerkRelation> relationList = staffClerkRelationService.listByWxEnterpriseId(wxEnterpriseId);
List<TabHaobanClerkMainStoreRelated> mainStoreList = clerkMainStoreRelatedService.listByWxEnterpriseId(wxEnterpriseId);
Map<String,TabHaobanClerkMainStoreRelated> map = mainStoreList.stream().collect(Collectors.toMap(TabHaobanClerkMainStoreRelated::getStaffId, s -> s));
List<TabHaobanPreDealLog> dealLogList = relationList.stream().filter(ls->map.get(ls.getStaffId()) != null).map(dto -> {
Map<String, TabHaobanClerkMainStoreRelated> map = mainStoreList.stream().collect(Collectors.toMap(TabHaobanClerkMainStoreRelated::getStaffId, s -> s));
List<TabHaobanPreDealLog> dealLogList = relationList.stream().filter(ls -> map.get(ls.getStaffId()) != null).map(dto -> {
TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
dealLog.setDataId(dto.getWxUserId());
dealLog.setpDataId(dto.getStaffId());
......@@ -691,14 +680,14 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
@Override
public void dealWxFriendClerkSingle(String taskId, String wxUserId, String staffId,String wxEnterpriseId) {
public void dealWxFriendClerkSingle(String taskId, String wxUserId, String staffId, String wxEnterpriseId) {
TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
dealLog.setDataId(wxUserId);
dealLog.setpDataId(staffId);
dealLog.setDataType(PreDealTypeEnum.friend_clerk.getVal());
dealLog.setStatusFlag(0);
dealLog.setTaskId(taskId);
dealLog.setDataContent("刷新"+staffId);
dealLog.setDataContent("刷新" + staffId);
dealLog.setWxEnterpriseId(wxEnterpriseId);
List<TabHaobanPreDealLog> dealLogList = new ArrayList<TabHaobanPreDealLog>();
dealLogList.add(dealLog);
......@@ -732,7 +721,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
@Override
public void quartWxFriendClerk(String res) {
List<TabHaobanSyncTask> taskList = syncTaskService.listTaskByType(2);
if(CollectionUtils.isNotEmpty(taskList)){
if (CollectionUtils.isNotEmpty(taskList)) {
for (TabHaobanSyncTask tabHaobanSyncTask : taskList) {
dealWxFriendClerk(tabHaobanSyncTask.getTaskId(), tabHaobanSyncTask.getWxEnterpriseId());
}
......@@ -741,7 +730,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
}
@Override
public void test(String wxEnterpriseId,String taskId){
public void test(String wxEnterpriseId, String taskId) {
List<TabHaobanStaffClerkRelation> relationList = new ArrayList<TabHaobanStaffClerkRelation>();
TabHaobanStaffClerkRelation tab = new TabHaobanStaffClerkRelation();
TabHaobanStaffClerkRelation tab1 = new TabHaobanStaffClerkRelation();
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -285,7 +285,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, storeId);
if (staffClerkRelationDTO == null) {
log.info("【新增外币联系人】导购和clerk关联为空");
log.info("【新增外部联系人】导购和clerk关联为空");
return;
}
//新增导购和外部联系人关系
......@@ -293,7 +293,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);
log.info("【新增外部联系人】clerkCode={},unionid:{}", clerkCode, unionId);
if (clerk == null) {
log.info("【新增外币联系人】导购为空");
log.info("【新增外部联系人】导购为空");
return;
}
String qrcodeParam = clerk.getQrcodeParam();
......@@ -353,6 +353,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
* @param dto
*/
private void insertExternalClerkRelatedNew(MemberUnionidRelatedDTO dto) {
log.info("新增外部联系人，创建关联关系：{}", JSON.toJSONString(dto));
String wxUserId = dto.getWxUserId();
String wxEnterpriseId = dto.getWxEnterpriseId();
String name = dto.getExternalName();
......@@ -378,7 +379,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
}
StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, mainStoreRelated.getStoreId());
if (staffClerkRelationDTO == null) {
log.info("【新增外币联系人】导购和clerk关联为空");
log.info("【新增外部联系人】导购和clerk关联为空");
return;
}
......@@ -389,10 +390,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
}
//好友不开卡 发送欢迎语
if (wxEnterpriseRelated.getMemberOpenCardFlag() == 1) {
log.info("欢迎页面：");
log.info("不同开平，欢迎页面：");
addFriendByWelcome(dto, staffClerkRelationDTO);
return;
} else {
log.info("同一开平，创建关联关系...");
if (unionId == null) {
log.info("unionid 不存在");
return;
......@@ -402,7 +404,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);
log.info("【新增外部联系人】clerkCode={},unionid:{}", clerkCode, unionId);
if (clerk == null) {
log.info("【新增外币联系人】导购为空:{},{}", clerkCode, unionId);
log.info("【新增外部联系人】导购为空:{},{}", clerkCode, unionId);
return;
}
......@@ -649,7 +651,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
return null;
}
//校验friend
CheckFriendSettingDTO friendSettingDTO = checkQywxSettingApiService.getFriendSetting();
String wxEnterpriseId = wxEnterprise.getWxEnterpriseId();
String userId = dto.getWxUserId();
String suiteid = dto.getSuiteid();
......@@ -1357,7 +1358,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
log.info("企业不存在");
return null;
}
// String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), "wwb3ef71aa8c6d9c06", externalUserId);
//String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), "ww2c34dc56739bb105", externalUserId);
String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), config.getWxSuiteid(), externalUserId);
if (StringUtils.isBlank(uJ)) {
log.info("好友不存在");
......@@ -1529,7 +1530,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
* @param enterpriseId
*/
private void pushTagSync(String memberId, String wxEnterpriseId, String enterpriseId) {
this.pushTagSync(memberId, "-1", GicQywxSyncTypeEnum.SINGLE_WXENT_MEMNER_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterpriseId,enterpriseId);
this.pushTagSync(memberId, "-1", GicQywxSyncTypeEnum.SINGLE_WXENT_MEMNER_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterpriseId, enterpriseId);
}
@Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java
......@@ -85,11 +85,10 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
}
@Override
public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(
String wxEnterpriseId) {
public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId) {
List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
List<EnterpriseDetailDTO> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
if (CollectionUtils.isEmpty(result)){
if (CollectionUtils.isEmpty(result)) {
return result;
}
return result;
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java
......@@ -182,13 +182,12 @@ public class WxEnterpriseController extends WebBaseController {
EnterpriseSearchVO vo = EntityUtil.changeEntityByJSON(EnterpriseSearchVO.class, dto);
if (vo != null) {
String enterpriseId = vo.getEnterpriseId();
EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(enterpriseId);
EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
if (enterprise != null) {
vo.setBrandName(enterprise.getBrandName());
}
}
return resultResponse(HaoBanErrCode.ERR_1, vo);
}
//微信企业绑定接口
......
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