Commit 28a027ec by 徐高华

log

parent 992847f4
...@@ -406,7 +406,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -406,7 +406,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
// 新增unionid表 // 新增unionid表
dto = getMemberUnionidRelatedDTONew(dto, wxUserId); dto = getMemberUnionidRelatedDTONew(dto, wxUserId);
if (null == dto) { if (null == dto) {
log.info("新增外部联系人,待开发和第三方回调未都收到"); log.info("新增外部联系人,代开发和第三方回调未全部收到,直接返回");
return null; return null;
} }
this.insertExternalClerkRelatedNew(dto, wxUserId,staff.getStaffName()); this.insertExternalClerkRelatedNew(dto, wxUserId,staff.getStaffName());
...@@ -489,7 +489,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -489,7 +489,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
} }
String enterpriseId = staffClerkRelationDTO.getEnterpriseId(); String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
hyClerkId = staffClerkRelationDTO.getClerkId() ; hyClerkId = staffClerkRelationDTO.getClerkId() ;
log.info("加好友,enterpriseId={},clerk={}",enterpriseId,hyClerkId); log.info("新增外部联系人,enterpriseId={},clerk={}",enterpriseId,hyClerkId);
TabHaobanWxEnterpriseRelated wxEnterpriseRelated = wxEnterpriseRelatedService.getByEnterpriseId(wxEnterpriseId, enterpriseId); TabHaobanWxEnterpriseRelated wxEnterpriseRelated = wxEnterpriseRelatedService.getByEnterpriseId(wxEnterpriseId, enterpriseId);
if (wxEnterpriseRelated == null) { if (wxEnterpriseRelated == null) {
log.info("加好友失败,商户未关联好办企业,wxEnterpriseId={},enterpriseId={}", wxEnterpriseId, enterpriseId); log.info("加好友失败,商户未关联好办企业,wxEnterpriseId={},enterpriseId={}", wxEnterpriseId, enterpriseId);
...@@ -497,7 +497,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -497,7 +497,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
} }
String memberId = null; String memberId = null;
boolean addByWelcome = this.wxEnterpriseRelatedService.getAddByWelcomeFlag(wxEnterpriseRelated,unionid) ; boolean addByWelcome = this.wxEnterpriseRelatedService.getAddByWelcomeFlag(wxEnterpriseRelated,unionid) ;
log.info("是否通过欢迎语加好友={},wxEnterpriseId:{},enterpriseId={},unionid={}",addByWelcome,wxEnterpriseId,enterpriseId,unionid); log.info("新增外部联系人,是否通过欢迎语={},wxEnterpriseId:{},enterpriseId={},unionid={}",addByWelcome,wxEnterpriseId,enterpriseId,unionid);
if(addByWelcome) { if(addByWelcome) {
unionid = null ; unionid = null ;
dto.setUnionid(unionid); dto.setUnionid(unionid);
...@@ -1036,7 +1036,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1036,7 +1036,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
* @return * @return
*/ */
private MemberUnionidRelatedDTO getMemberUnionidRelatedDTONew(MemberUnionidRelatedDTO dto, String wxUserId) { private MemberUnionidRelatedDTO getMemberUnionidRelatedDTONew(MemberUnionidRelatedDTO dto, String wxUserId) {
log.info("【新增外部联系人回调】dto={},wxUserId={}", JSON.toJSONString(dto), wxUserId); log.info("【新增外部联系人】dto={},wxUserId={}", JSON.toJSONString(dto), wxUserId);
String wxEnterpriseId = dto.getWxEnterpriseId() ; String wxEnterpriseId = dto.getWxEnterpriseId() ;
String suiteid = dto.getSuiteid(); String suiteid = dto.getSuiteid();
String externalUserid = dto.getExternalUserid(); String externalUserid = dto.getExternalUserid();
...@@ -1048,7 +1048,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1048,7 +1048,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
} }
checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId, externalUserDTO, dto); checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId, externalUserDTO, dto);
if (externalUserDTO == null) { if (externalUserDTO == null) {
log.info("【新增外部联系人回调】失败,查询好友失败,externalUserid={}",externalUserid); log.info("【新增外部联系人查询好友失败,externalUserid={}",externalUserid);
return null; return null;
} }
dto.setWxEnterpriseId(wxEnterpriseId); dto.setWxEnterpriseId(wxEnterpriseId);
...@@ -1072,7 +1072,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1072,7 +1072,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
RedisUtil.lock(lockKey, 10L); RedisUtil.lock(lockKey, 10L);
MemberUnionidRelatedDTO cacheDTO = RedisUtil.getCache(key, MemberUnionidRelatedDTO.class); MemberUnionidRelatedDTO cacheDTO = RedisUtil.getCache(key, MemberUnionidRelatedDTO.class);
if (cacheDTO == null) { if (cacheDTO == null) {
log.info("redis缓存中无该好友数据,插入数据:{}", JSON.toJSONString(dto)); log.info("只收到一个回调,数据写入缓存后返回={}", JSON.toJSONString(dto));
RedisUtil.setCache(key, dto, 180L); RedisUtil.setCache(key, dto, 180L);
RedisUtil.unlock(lockKey); RedisUtil.unlock(lockKey);
return null; return null;
...@@ -1084,11 +1084,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1084,11 +1084,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
dto.setSelfExternalUserid(StringUtils.isBlank(dto.getSelfExternalUserid()) ? cacheDTO.getSelfExternalUserid() : dto.getSelfExternalUserid()); dto.setSelfExternalUserid(StringUtils.isBlank(dto.getSelfExternalUserid()) ? cacheDTO.getSelfExternalUserid() : dto.getSelfExternalUserid());
if (StringUtils.isAnyBlank(dto.getExternalUserid(), dto.getSelfExternalUserid())) { if (StringUtils.isAnyBlank(dto.getExternalUserid(), dto.getSelfExternalUserid())) {
log.error("加好友异常,只有一个外部联系人id,wxEnterpriseId:{}", wxEnterpriseId, dto.getExternalUserid()); log.error("新增外部联系人,只有一个外部联系人id,wxEnterpriseId:{}", wxEnterpriseId, dto.getExternalUserid());
return null; return null;
} }
log.info("新增外部联系人,unionid数据={}", JSON.toJSONString(dto)); log.info("新增外部联系人,写unionid表数据={}", JSON.toJSONString(dto));
String memberUnionidRelatedId = memberUnionRelatedService.addMemberUnionidRelated(dto); String memberUnionidRelatedId = memberUnionRelatedService.addMemberUnionidRelated(dto);
dto.setMemberUnionidRelatedId(memberUnionidRelatedId); dto.setMemberUnionidRelatedId(memberUnionidRelatedId);
RedisUtil.unlock(lockKey); RedisUtil.unlock(lockKey);
......
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