Skip to content

H
haoban-manage3.0
Commit 3f86c03d by 墨竹
Options

fix：格式化代码

parent 7d561d40
Showing with 77 additions and 76 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
...@@ -369,82 +369,83 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -369,82 +369,83 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
log.info("不同开平，欢迎页面："); log.info("不同开平，欢迎页面：");
addFriendByWelcome(dto, staffClerkRelationDTO); addFriendByWelcome(dto, staffClerkRelationDTO);
return; return;
} else { }
log.info("同一开平，创建关联关系...");
String unionId = dto.getUnionid();
if (unionId == null) {
log.info("unionid 不存在");
return;
}
//新增导购和外部联系人关系
String clerkCode = staffClerkRelationDTO.getClerkCode();
String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
log.info("【新增外部联系人】clerkCode={},unionid:{}", clerkCode, unionId);
if (clerk == null) {
log.info("【新增外部联系人】导购为空:{},{}", clerkCode, unionId);
return;
}
String qrcodeParam = clerk.getQrcodeParam(); log.info("同一开平，创建关联关系...");
if (StringUtils.isBlank(qrcodeParam)) { String unionId = dto.getUnionid();
powerService.saveClerkQrCode(clerk.getClerkId()); if (unionId == null) {
clerk = clerkService.getClerkByClerkCode(enterpriseId, clerkCode); log.info("unionid 不存在");
qrcodeParam = clerk.getQrcodeParam(); return;
} }
if (StringUtils.isBlank(qrcodeParam)) { //新增导购和外部联系人关系
log.info("不能生产导购二维码：{}", JSONObject.toJSONString(clerk)); String clerkCode = staffClerkRelationDTO.getClerkCode();
return; String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
} ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}", enterpriseId, unionId, name, avatar, qrcodeParam); log.info("【新增外部联系人】clerkCode={},unionid:{}", clerkCode, unionId);
MemberDTO member = memberOpenCardBusinessService.getMemberByQywxChannelParam(enterpriseId, unionId, "", name, avatar, qrcodeParam); if (clerk == null) {
if (member == null) { log.info("【新增外部联系人】导购为空:{},{}", clerkCode, unionId);
log.info("生产会员memnerid失败：{}", unionId); return;
return; }
}
String clerkId = staffClerkRelationDTO.getClerkId(); String qrcodeParam = clerk.getQrcodeParam();
String memberId = member.getMemberId(); if (StringUtils.isBlank(qrcodeParam)) {
List<TabHaobanExternalClerkRelated> externalClerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserid, dto.getWxUserId()); powerService.saveClerkQrCode(clerk.getClerkId());
String relationKey = SecureUtil.md5(staffId + externalUserid); clerk = clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
if (CollectionUtils.isEmpty(externalClerkRelateds)) { qrcodeParam = clerk.getQrcodeParam();
log.info("新增TabHaobanExternalClerkRelated"); }
TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated(); if (StringUtils.isBlank(qrcodeParam)) {
related.setAddCreateTime(createTime); log.info("不能生产导购二维码：{}", JSONObject.toJSONString(clerk));
related.setClerkId(clerkId); return;
related.setEnterpriseId(enterpriseId); }
related.setExternalName(name); log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}", enterpriseId, unionId, name, avatar, qrcodeParam);
related.setExternalUserId(externalUserid); MemberDTO member = memberOpenCardBusinessService.getMemberByQywxChannelParam(enterpriseId, unionId, "", name, avatar, qrcodeParam);
related.setStaffId(staffId); if (member == null) {
related.setHeadUrl(dto.getAvatar()); log.info("生产会员memnerid失败：{}", unionId);
related.setMemberUnionidRelatedId(dto.getMemberUnionidRelatedId()); return;
related.setStoreId(staffClerkRelationDTO.getStoreId());
related.setRelationKey(relationKey);
related.setUnionid(unionId);
related.setWxEnterpriseId(wxEnterpriseId);
related.setWxUserId(wxUserId);
related.setMemberId(memberId);
externalClerkRelatedService.insert(related);
} else {
log.info("更新TabHaobanExternalClerkRelated");
TabHaobanExternalClerkRelated exsitDTO = externalClerkRelateds.get(0);
exsitDTO.setMemberId(memberId);
exsitDTO.setMemberUnionidRelatedId(dto.getMemberUnionidRelatedId());
exsitDTO.setExternalUserId(externalUserid);
exsitDTO.setUnionid(unionId);
exsitDTO.setRelationKey(relationKey);
exsitDTO.setHeadUrl(dto.getAvatar());
exsitDTO.setStoreId(staffClerkRelationDTO.getStoreId());
exsitDTO.setEnterpriseId(enterpriseId);
exsitDTO.setClerkId(clerkId);
exsitDTO.setStatusFlag(1);
externalClerkRelatedService.update(exsitDTO);
}
sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, clerkId, false);
//同步好友标签
pushTagSync(memberId, wxEnterpriseId, enterpriseId);
//回调给会员，更新是否为企微好友
memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
} }
String clerkId = staffClerkRelationDTO.getClerkId();
String memberId = member.getMemberId();
List<TabHaobanExternalClerkRelated> externalClerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserid, dto.getWxUserId());
String relationKey = SecureUtil.md5(staffId + externalUserid);
if (CollectionUtils.isEmpty(externalClerkRelateds)) {
log.info("新增TabHaobanExternalClerkRelated");
TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated();
related.setAddCreateTime(createTime);
related.setClerkId(clerkId);
related.setEnterpriseId(enterpriseId);
related.setExternalName(name);
related.setExternalUserId(externalUserid);
related.setStaffId(staffId);
related.setHeadUrl(dto.getAvatar());
related.setMemberUnionidRelatedId(dto.getMemberUnionidRelatedId());
related.setStoreId(staffClerkRelationDTO.getStoreId());
related.setRelationKey(relationKey);
related.setUnionid(unionId);
related.setWxEnterpriseId(wxEnterpriseId);
related.setWxUserId(wxUserId);
related.setMemberId(memberId);
externalClerkRelatedService.insert(related);
} else {
log.info("更新TabHaobanExternalClerkRelated");
TabHaobanExternalClerkRelated exsitDTO = externalClerkRelateds.get(0);
exsitDTO.setMemberId(memberId);
exsitDTO.setMemberUnionidRelatedId(dto.getMemberUnionidRelatedId());
exsitDTO.setExternalUserId(externalUserid);
exsitDTO.setUnionid(unionId);
exsitDTO.setRelationKey(relationKey);
exsitDTO.setHeadUrl(dto.getAvatar());
exsitDTO.setStoreId(staffClerkRelationDTO.getStoreId());
exsitDTO.setEnterpriseId(enterpriseId);
exsitDTO.setClerkId(clerkId);
exsitDTO.setStatusFlag(1);
externalClerkRelatedService.update(exsitDTO);
}
sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, clerkId, false);
//同步好友标签
pushTagSync(memberId, wxEnterpriseId, enterpriseId);
//回调给会员，更新是否为企微好友
memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
} }
...@@ -573,7 +574,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -573,7 +574,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
} }
List<WelcomeMediaBO> welcomeMediaList = welcomeDetailBO.getWelcomeMediaList(); List<WelcomeMediaBO> welcomeMediaList = welcomeDetailBO.getWelcomeMediaList();
log.info("欢迎语发送附件list:{}",JSON.toJSONString(welcomeMediaList)); log.info("欢迎语发送附件list:{}", JSON.toJSONString(welcomeMediaList));
if (CollectionUtils.isNotEmpty(welcomeMediaList)) { if (CollectionUtils.isNotEmpty(welcomeMediaList)) {
for (WelcomeMediaBO welcomeMediaBO : welcomeMediaList) { for (WelcomeMediaBO welcomeMediaBO : welcomeMediaList) {
...@@ -1853,7 +1854,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1853,7 +1854,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
//重试5次 //重试5次
Integer currentTimes = Convert.toInt(RedisUtil.getCache(relationKey), 0); Integer currentTimes = Convert.toInt(RedisUtil.getCache(relationKey), 0);
if (currentTimes > MAX_TIMES) { if (currentTimes > MAX_TIMES) {
log.error("关注公共号-会员回调好办关联好友重试超过最大次数，relationKey：{}",relationKey); log.error("关注公共号-会员回调好办关联好友重试超过最大次数，relationKey：{}", relationKey);
return; return;
} }
GicMQClient clientInstance = GICMQClientUtil.getClientInstance(); GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
......
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