Commit 317daeea by 徐高华

动态活码

parent 1a50bafb
...@@ -92,7 +92,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService { ...@@ -92,7 +92,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
@Autowired @Autowired
private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper; private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper;
@Autowired @Autowired
private MemberClerkApiService memberClerkApiService ; private MemberClerkApiService memberClerkApiService;
@Override @Override
public ServiceResponse<String> getHmLinkUrl() { public ServiceResponse<String> getHmLinkUrl() {
...@@ -249,7 +249,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService { ...@@ -249,7 +249,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
List<MemberStoreClerkDataDTO> list = member.getStoreClerkRel(); List<MemberStoreClerkDataDTO> list = member.getStoreClerkRel();
if (null == hm && null != xgStore && CollectionUtils.isNotEmpty(list)) { if (null == hm && null != xgStore && CollectionUtils.isNotEmpty(list)) {
// 排序协管导购 // 排序协管导购
list = this.sortMemberClerk(enterpriseId,memberId,list); list = this.sortMemberClerk(enterpriseId, memberId, list);
List<String> storeIdList = new ArrayList<>(); List<String> storeIdList = new ArrayList<>();
// 协管导购 // 协管导购
for (MemberStoreClerkDataDTO item : list) { for (MemberStoreClerkDataDTO item : list) {
...@@ -347,14 +347,17 @@ public class HmLinkApiServiceImpl implements HmLinkApiService { ...@@ -347,14 +347,17 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
return ServiceResponse.success(retDTO); return ServiceResponse.success(retDTO);
} }
private List<MemberStoreClerkDataDTO> sortMemberClerk(String enterpriseId , String memberId ,List<MemberStoreClerkDataDTO> list) { private List<MemberStoreClerkDataDTO> sortMemberClerk(String enterpriseId, String memberId,
ServiceResponse<List<MemberClerkDTO>> resp = this.memberClerkApiService.getMemberMainClerkList(enterpriseId, memberId) ; List<MemberStoreClerkDataDTO> list) {
if(!resp.isSuccess() && CollectionUtils.isEmpty(resp.getResult())) { ServiceResponse<List<MemberClerkDTO>> resp = this.memberClerkApiService.getMemberMainClerkList(enterpriseId,
log.info("member主导购={},memberId",resp.getMessage(),memberId) ; memberId);
return list ; if (!resp.isSuccess() && CollectionUtils.isEmpty(resp.getResult())) {
log.info("member主导购={},memberId", resp.getMessage(), memberId);
return list;
} }
List<MemberStoreClerkDataDTO> retList = new ArrayList<>(); List<MemberStoreClerkDataDTO> retList = new ArrayList<>();
List<String> mainClerkIdList = resp.getResult().stream().map(dto->dto.getClerkId()).collect(Collectors.toList()); List<String> mainClerkIdList = resp.getResult().stream().map(dto -> dto.getClerkId())
.collect(Collectors.toList());
List<MemberStoreClerkDataDTO> notMainClerkList = new ArrayList<>(); List<MemberStoreClerkDataDTO> notMainClerkList = new ArrayList<>();
for (MemberStoreClerkDataDTO item : retList) { for (MemberStoreClerkDataDTO item : retList) {
if (mainClerkIdList.contains(item.getClerkIdRel())) { if (mainClerkIdList.contains(item.getClerkIdRel())) {
...@@ -380,22 +383,22 @@ public class HmLinkApiServiceImpl implements HmLinkApiService { ...@@ -380,22 +383,22 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
paramsDTO.setRemark(hm.getName()); paramsDTO.setRemark(hm.getName());
paramsDTO.setSkipVerify(hm.getPassFlag() == 1); paramsDTO.setSkipVerify(hm.getPassFlag() == 1);
paramsDTO.setState("DT" + key); paramsDTO.setState("DT" + key);
// paramsDTO.setTemp(true);
paramsDTO.setUser(Arrays.asList(hm.getWxUserId())); paramsDTO.setUser(Arrays.asList(hm.getWxUserId()));
QywxExternalcontactResultDTO dto = qywxUserApiService.addContactWay(corpid, config.getWxSuiteid(), paramsDTO); QywxExternalcontactResultDTO wxResp = qywxUserApiService.addContactWay(corpid, config.getWxSuiteid(),
log.info("创建动态活码参数corpid:{}{},param={},返回={}", corpid, config.getWxSuiteid(), JSON.toJSONString(paramsDTO), paramsDTO);
JSON.toJSONString(dto)); log.info("创建动态活码参数corpid={},app={},param={},返回={}", corpid, config.getWxSuiteid(), JSON.toJSONString(paramsDTO),
if (null != dto && "0".equals(dto.getErrcode())) { JSON.toJSONString(wxResp));
retDTO.setHmQrcode(dto.getQr_code()); if (null != wxResp && 0 == wxResp.getErrcode()) {
retDTO.setHmQrcode(wxResp.getQr_code());
HmQrcodeTempQO qo = new HmQrcodeTempQO(); HmQrcodeTempQO qo = new HmQrcodeTempQO();
qo.setWxEnterpriseId(hm.getWxEnterpriseId()); qo.setWxEnterpriseId(hm.getWxEnterpriseId());
qo.setWxConfigId(dto.getConfig_id()); qo.setWxConfigId(wxResp.getConfig_id());
qo.setWxQrcode(dto.getQr_code()); qo.setWxQrcode(wxResp.getQr_code());
qo.setRelationId(key); qo.setRelationId(key);
this.hmQrcodeTempService.save(qo); this.hmQrcodeTempService.save(qo);
return ServiceResponse.success(dto.getQr_code()); return ServiceResponse.success(wxResp.getQr_code());
} }
return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "企微错误:" + dto.getErrmsg()); return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "企微错误:" + wxResp.getErrmsg());
} }
private String limitIp(HmQrcodeBO hm) { private String limitIp(HmQrcodeBO hm) {
......
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