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/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