Skip to content

H
haoban-manage3.0
Commit 5ccfaec3 by 墨竹
Options

feat：会员关联修改

parent 5167d595
Showing with 69 additions and 25 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java
...@@ -74,6 +74,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -74,6 +74,7 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 刷新企微好友 * 刷新企微好友
*
* @param wxEnterpriseId * @param wxEnterpriseId
* @param wxUserId * @param wxUserId
* @param storeId * @param storeId
...@@ -154,6 +155,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -154,6 +155,7 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 清楚不存在的好友关系 * 清楚不存在的好友关系
*
* @param wxEnterpriseId * @param wxEnterpriseId
* @param wxUserId * @param wxUserId
* @param resWes * @param resWes
...@@ -163,6 +165,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -163,6 +165,7 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 客户列表-自建 * 客户列表-自建
*
* @param wxEnterpriseId * @param wxEnterpriseId
* @param wxUserId * @param wxUserId
* @return * @return
...@@ -171,6 +174,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -171,6 +174,7 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 客户详情-第三方 * 客户详情-第三方
*
* @param wxEnterpriseId * @param wxEnterpriseId
* @param wxUserId * @param wxUserId
* @return * @return
...@@ -179,6 +183,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -179,6 +183,7 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 客户详情-自建 * 客户详情-自建
*
* @param wxEnterpriseId * @param wxEnterpriseId
* @param wxUserId * @param wxUserId
* @param externalUserId * @param externalUserId
...@@ -188,6 +193,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -188,6 +193,7 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 添加企微好友关联关系表-无需触达 * 添加企微好友关联关系表-无需触达
*
* @param dto * @param dto
* @return * @return
*/ */
...@@ -195,6 +201,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -195,6 +201,7 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 添加企微好友关联关系表-需触达方式 * 添加企微好友关联关系表-需触达方式
*
* @param dto * @param dto
* @return * @return
*/ */
...@@ -202,6 +209,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -202,6 +209,7 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 获取客户详情-第三方 * 获取客户详情-第三方
*
* @param wxEnterpriseId * @param wxEnterpriseId
* @param wxUserId * @param wxUserId
* @param externalUserId * @param externalUserId
...@@ -264,6 +272,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -264,6 +272,7 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 关注公共号-会员回调好办关联好友（通过公共号二维码带参数） * 关注公共号-会员回调好办关联好友（通过公共号二维码带参数）
* "routerName"：addMemberUnionidWechatAccountByClerkMq * "routerName"：addMemberUnionidWechatAccountByClerkMq
*
* @param res res * @param res res
* @author mozhu * @author mozhu
* @date 2022-02-21 14:56:25 * @date 2022-02-21 14:56:25
...@@ -274,14 +283,36 @@ public interface MemberUnionidRelatedApiService { ...@@ -274,14 +283,36 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 根据unionid查询导购好友 * 根据unionid查询导购好友
* *
* @param wxEnterpriseId wx企业标识 * @param wxEnterpriseId wx企业标识
* @param wxUserId wx用户id * @param wxUserId wx用户id
* @param unionid unionid * @param unionid unionid
* @param selfExternalUserid 自外部用户标识
* @return {@link MemberUnionidRelatedDTO } * @return {@link MemberUnionidRelatedDTO }
* @author mozhu * @author mozhu
* @date 2022-03-11 15:41:09 * @date 2022-03-11 15:41:09
*/ */
MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid,String selfExternalUserid); MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid);
/**
* 根据id查询
*
* @param memberUnionidRelatedId 成员unionid相关id
* @return {@link MemberUnionidRelatedDTO }
* @author mozhu
* @date 2022-03-11 17:02:45
*/
MemberUnionidRelatedDTO getById(String memberUnionidRelatedId);
/**
* 更新对外联系人id
*
* @param selfExternalUserid 自外部用户标识
* @param memberUnionidRelatedId 成员unionid相关id
* @author mozhu
* @date 2022-03-11 16:59:24
*/
void updateSelfExternalUseridById(String selfExternalUserid, String memberUnionidRelatedId);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
...@@ -1865,18 +1865,22 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1865,18 +1865,22 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
} }
@Override @Override
public MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid, String selfExternalUserid) { public MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid) {
MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionRelatedService.getByWxUserIdAndUnionId(wxEnterpriseId, wxUserId, unionid); return memberUnionRelatedService.getByWxUserIdAndUnionId(wxEnterpriseId, wxUserId, unionid);
//做一个修复逻辑,如果在我们表中有好友关联，但是自建好友外部联系人为空，更新数据 }
if (memberUnionidRelatedDTO != null &&
StringUtils.isBlank(memberUnionidRelatedDTO.getSelfExternalUserid()) @Override
&& StringUtils.isNotBlank(selfExternalUserid)) { public void updateSelfExternalUseridById(String selfExternalUserid, String memberUnionidRelatedId) {
MemberUnionidRelatedDTO relatedDTO = new MemberUnionidRelatedDTO(); MemberUnionidRelatedDTO relatedDTO = new MemberUnionidRelatedDTO();
relatedDTO.setMemberUnionidRelatedId(memberUnionidRelatedDTO.getMemberUnionidRelatedId()); relatedDTO.setMemberUnionidRelatedId(memberUnionidRelatedId);
relatedDTO.setSelfExternalUserid(selfExternalUserid); relatedDTO.setSelfExternalUserid(selfExternalUserid);
memberUnionRelatedService.update(relatedDTO); memberUnionRelatedService.update(relatedDTO);
} }
return memberUnionidRelatedDTO;
@Override
public MemberUnionidRelatedDTO getById(String memberUnionidRelatedId) {
MemberUnionidRelated memberUnionidRelated = memberUnionidRelatedMapper.selectByPrimaryKey(memberUnionidRelatedId);
return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class,memberUnionidRelated);
} }
/** /**
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
...@@ -650,7 +650,7 @@ ...@@ -650,7 +650,7 @@
where wx_user_id = #{wxUserId,jdbcType=VARCHAR} where wx_user_id = #{wxUserId,jdbcType=VARCHAR}
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
and unionid = #{unionid} and unionid = #{unionid}
and status_flag in(1,3,4) and status_flag = 1
order by update_time desc limit 1 order by update_time desc limit 1
</select> </select>
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
...@@ -420,20 +420,29 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -420,20 +420,29 @@ public class WxEnterpriseInfoController extends WebBaseController {
logger.info("企业不存在没有绑定,wxEnterpriseId:{}", wxEnterpriseId); logger.info("企业不存在没有绑定,wxEnterpriseId:{}", wxEnterpriseId);
return resultResponse(HaoBanErrCode.ERR_400002); return resultResponse(HaoBanErrCode.ERR_400002);
} }
//获取自建客户详情
ExternalUserDTO externalUserDTO = memberUnionidRelatedApiService.getCorpSelfExternalUseridInfo(wxEnterpriseId, wxUserId, externalUserid); ExternalUserDTO externalUserDTO = memberUnionidRelatedApiService.getCorpSelfExternalUseridInfo(wxEnterpriseId, wxUserId, externalUserid);
if (externalUserDTO == null) { if (externalUserDTO == null) {
logger.info("请先添加好友，企业微信未查询到该好友,externalUserid:{}", externalUserid); logger.info("请先添加好友，企业微信未查询到该好友,externalUserid:{}", externalUserid);
return resultResponse(HaoBanErrCode.ERR_11126); return resultResponse(HaoBanErrCode.ERR_11126);
} else {
//是否需修复数据
String unionId = externalUserDTO.getUnionId();
ExternalClerkRelatedDTO externalClerkRelatedDTO = externalClerkRelatedApiService.getByWxEnterpriseIdAndUnionId(wxEnterpriseId, wxUserId, unionId);
String memberUnionidRelatedId = externalClerkRelatedDTO.getMemberUnionidRelatedId();
MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getById(memberUnionidRelatedId);
if (memberUnionidRelatedDTO != null && StringUtils.isBlank(memberUnionidRelatedDTO.getSelfExternalUserid())) {
memberUnionidRelatedApiService.updateSelfExternalUseridById(externalUserid, memberUnionidRelatedId);
}
} }
String unionId = externalUserDTO.getUnionId(); MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getBySelfExternalUserId(wxEnterpriseId, externalUserid);
ExternalClerkRelatedDTO clerkRelatedDTO = externalClerkRelatedApiService.getByWxEnterpriseIdAndUnionId(wxEnterpriseId, wxUserId, unionId); if (null == memberUnionidRelatedDTO) {
if (clerkRelatedDTO == null) { logger.info("请刷新好友，wxEnterpriseId:{},externalUserid：{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId);
logger.info("该企业没有对应需要发送好友关系的信息，wxEnterpriseId:{},externalUserid：{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId);
return resultResponse(HaoBanErrCode.ERR_11123); return resultResponse(HaoBanErrCode.ERR_11123);
} }
MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getByWxUserIdAndUnionId(wxEnterpriseId, wxUserId, unionId, externalUserid); ExternalClerkRelatedDTO clerkRelatedDTO = externalClerkRelatedApiService.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, wxUserId, gicEnterpriseId, memberUnionidRelatedDTO.getExternalUserid());
if (memberUnionidRelatedDTO == null) { if (clerkRelatedDTO == null) {
logger.info("该企业没有对应需要发送好友关系的信息，wxEnterpriseId:{},unionId：{},wxUserId:{}", wxEnterpriseId, unionId, wxUserId); logger.info("该企业没有对应需要发送好友关系的信息，wxEnterpriseId:{},externalUserid：{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId);
return resultResponse(HaoBanErrCode.ERR_11123); return resultResponse(HaoBanErrCode.ERR_11123);
} }
MiniprogramSettingDTO settingDTO = wxEnterpriseApiService.getMiniprogramSettingByEid(wxEnterpriseId, gicEnterpriseId); MiniprogramSettingDTO settingDTO = wxEnterpriseApiService.getMiniprogramSettingByEid(wxEnterpriseId, gicEnterpriseId);
......
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