Commit c0e9f3d2 by 徐高华

群活码-链接调整

parent 1e1c4a34
......@@ -198,6 +198,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
String mixPhone, String unionid, String memberId, HmLinkBO link, HmLinkWxaDTO retDTO, LinkHmFromWxaQDTO qdto,String inStoreId) {
Long hmId = link.getOtherChatHmId();
Long linkId = link.getLinkId();
retDTO.setGroupChatHm(true);
if (StringUtils.isNotEmpty(mixPhone)) {
String mobile = this.keyDataService.getMobile(mixPhone, link.getShortCode());
log.info("查询手机号,mobile={},mixPhone={}", mobile, mixPhone);
......@@ -267,7 +268,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
hmId = storeToHmMap.values().iterator().next().get(0).getChatHmId();
break;
}else {
List<HmLinkStoreDTO> storeList = page.getResult().stream().map(store -> {
List<HmLinkStoreDTO> storeList = page.getResult().stream().filter(o->CollectionUtils.isNotEmpty(storeToHmMap.get(o.getStoreId()))).map(store -> {
HmLinkStoreDTO storeDTO = EntityUtil.changeEntityByJSON(HmLinkStoreDTO.class, store) ;
return storeDTO;
}).collect(Collectors.toList()) ;
......@@ -347,6 +348,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
// 如果是社群链接
if (link.getLinkType() == HmLinkTypeEnum.CHAT_HM_LINK_TYPE.getLinkType()) {
retDTO.setGroupChatHm(true);
log.info("群链接,linkId={}", link.getLinkId());
if(null != qdto.getJustLocationFlag() && qdto.getJustLocationFlag()==1) {
JSONArray arr = JSONArray.parseArray(link.getChatStoreRule()) ;
......@@ -366,9 +368,6 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
}
}
ServiceResponse<HmLinkWxaDTO> resp = this.getLinkChatHmFromWxa(wxEnterpriseId, enterpriseId, mixPhone, unionid, memberId, link, retDTO,qdto,inStoreId);
if(null != resp.getResult()) {
resp.getResult().setGroupChatHm(true);
}
return resp;
}
......
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