Commit a0643e5f by 墨竹

Merge branch 'master' into developer

parents 30cb2495 da6481ba
...@@ -408,24 +408,25 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -408,24 +408,25 @@ public class WxEnterpriseInfoController extends WebBaseController {
if (StringUtils.isAnyBlank(externalUserid, wxUserId, wxEnterpriseId)) { if (StringUtils.isAnyBlank(externalUserid, wxUserId, wxEnterpriseId)) {
return resultResponse(HaoBanErrCode.ERR_2); return resultResponse(HaoBanErrCode.ERR_2);
} }
WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, gicEnterpriseId); WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, gicEnterpriseId);
if (null == enterpriseBindInfo) { if (null == enterpriseBindInfo) {
logger.info("企业不存在没有绑定"); logger.info("企业不存在没有绑定,wxEnterpriseId:{}", wxEnterpriseId);
return resultResponse(HaoBanErrCode.ERR_400002); return resultResponse(HaoBanErrCode.ERR_400002);
} }
MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getBySelfExternalUserId(wxEnterpriseId, externalUserid); MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getBySelfExternalUserId(wxEnterpriseId, externalUserid);
if (null == memberUnionidRelatedDTO) { if (null == memberUnionidRelatedDTO) {
logger.info("请刷新好友"); logger.info("请刷新好友,wxEnterpriseId:{},externalUserid:{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId);
return resultResponse(HaoBanErrCode.ERR_11123); return resultResponse(HaoBanErrCode.ERR_11123);
} }
ExternalClerkRelatedDTO clerkRelatedDTO = externalClerkRelatedApiService.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, wxUserId, gicEnterpriseId, memberUnionidRelatedDTO.getExternalUserid()); ExternalClerkRelatedDTO clerkRelatedDTO = externalClerkRelatedApiService.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, wxUserId, gicEnterpriseId, memberUnionidRelatedDTO.getExternalUserid());
if (clerkRelatedDTO == null) { if (clerkRelatedDTO == null) {
logger.info("该企业没有对应需要发送好友关系的信息"); 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);
if (null == settingDTO) { if (null == settingDTO) {
logger.info("该企业没有对应需要发送的小程序信息"); logger.info("该企业没有对应需要发送的小程序信息,wxEnterpriseId:{}", wxEnterpriseId);
return resultResponse(HaoBanErrCode.ERR_11124); return resultResponse(HaoBanErrCode.ERR_11124);
} }
EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(gicEnterpriseId); EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(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