Skip to content

H
haoban-manage3.0
Commit 4fee465e by 墨竹
Options

feat：会员登录bug修改

parent 9834e78d
Showing with 25 additions and 30 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java
...@@ -24,39 +24,38 @@ public interface MemberUnionidRelatedMapper { ...@@ -24,39 +24,38 @@ public interface MemberUnionidRelatedMapper {
int cleanByCid(@Param("cid") String cid); int cleanByCid(@Param("cid") String cid);
MemberUnionidRelated getByUnionId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId, @Param("unionid") String unionid); MemberUnionidRelated getByUnionId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId, @Param("unionid") String unionid);
MemberUnionidRelated getByMemberId(@Param("wxUserId")String wxUserId, @Param("memberId")String memberId); MemberUnionidRelated getByMemberId(@Param("wxUserId") String wxUserId, @Param("memberId") String memberId);
void deleteByUnionidAndUserId(@Param("externalUserid")String externalUserid,@Param("wxUserId") String wxUserId); void deleteByUnionidAndUserId(@Param("externalUserid") String externalUserid, @Param("wxUserId") String wxUserId);
void delMemberUnionidRelatedBatch(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserids") List<String> externalUserid, @Param("wxUserId") String wxUserId); void delMemberUnionidRelatedBatch(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserids") List<String> externalUserid, @Param("wxUserId") String wxUserId);
List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId); List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId);
List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId")String enterpriseId,@Param("date")Date date);
MemberUnionidRelated getByParams(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId,
@Param("externalName")String name, @Param("addCreateTime")String createTime);
List<MemberUnionidRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid")String externalUserid, @Param("wxUserId")String wxUserId); List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId") String enterpriseId, @Param("date") Date date);
Page<MemberUnionidRelated> pageMemberUnionByParams(@Param("userIdList")List<String> userIdList, @Param("sendMemberIds")List<String> sendMemberIds, MemberUnionidRelated getByParams(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId")String enterpriseId); @Param("externalName") String name, @Param("addCreateTime") String createTime);
List<MemberUnionidRelated> getByWxUserIdListAndWxEnterpriseId(@Param("userIdList")List<String> userIdList, @Param("wxEnterpriseId")String wxEnterpriseId); List<MemberUnionidRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid") String externalUserid, @Param("wxUserId") String wxUserId);
void cleanStaffRelated(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("staffIds")List<String> staffIds); Page<MemberUnionidRelated> pageMemberUnionByParams(@Param("userIdList") List<String> userIdList, @Param("sendMemberIds") List<String> sendMemberIds,
@Param("enterpriseId") String enterpriseId);
/** List<MemberUnionidRelated> getByWxUserIdListAndWxEnterpriseId(@Param("userIdList") List<String> userIdList, @Param("wxEnterpriseId") String wxEnterpriseId);
* 根据应用内的外部联系人获取信息
*
* @param wxUserId
* @param wxEnterpriseId
* @param selfExternalUserId
* @return
*/
MemberUnionidRelated getBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
List<MemberUnionidRelated> listBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId); void cleanStaffRelated(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
/**
* 根据应用内的外部联系人获取信息
*
* @param wxEnterpriseId
* @param selfExternalUserId
* @return
*/
MemberUnionidRelated getBySelfExternalUserId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
List<MemberUnionidRelated> listBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
} }
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MemberUnionRelatedServiceImpl.java
...@@ -87,7 +87,7 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService ...@@ -87,7 +87,7 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
@Override @Override
public MemberUnionidRelatedDTO getBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId) { public MemberUnionidRelatedDTO getBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId) {
MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(wxUserId, wxEnterpriseId, selfExternalUserId); MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(wxEnterpriseId, selfExternalUserId);
return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated); return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);
} }
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
...@@ -407,10 +407,6 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -407,10 +407,6 @@ public class WxEnterpriseInfoController extends WebBaseController {
logger.info("企业不存在没有绑定"); logger.info("企业不存在没有绑定");
return resultResponse(HaoBanErrCode.ERR_400002); return resultResponse(HaoBanErrCode.ERR_400002);
} }
//if (enterpriseBindInfo.getMemberOpenCardFlag() != 1) {
// logger.info("该企业在同一个开平，无需手动关联:wxEid:{}, eid:{}", wxEnterpriseId, gicEnterpriseId);
// return resultResponse(HaoBanErrCode.ERR_11125);
//}
MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getExternalUseridInfoBySelfExternalUserId(wxEnterpriseId, wxUserId, externalUserid); MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getExternalUseridInfoBySelfExternalUserId(wxEnterpriseId, wxUserId, externalUserid);
if (null == memberUnionidRelatedDTO) { if (null == memberUnionidRelatedDTO) {
logger.info("请刷新好友"); logger.info("请刷新好友");
...@@ -438,7 +434,6 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -438,7 +434,6 @@ public class WxEnterpriseInfoController extends WebBaseController {
memberSendMessageVo.setWxaHandUrl(enterpriseDTO.getMallMiniprogramLogoUrl()); memberSendMessageVo.setWxaHandUrl(enterpriseDTO.getMallMiniprogramLogoUrl());
memberSendMessageVo.setBindFlag(clerkRelatedDTO.getStatusFlag() == 1 ? 1 : 0); memberSendMessageVo.setBindFlag(clerkRelatedDTO.getStatusFlag() == 1 ? 1 : 0);
memberSendMessageVo.setWxaName(settingDTO.getMiniprogramName()); memberSendMessageVo.setWxaName(settingDTO.getMiniprogramName());
return resultResponse(HaoBanErrCode.ERR_1, memberSendMessageVo); return resultResponse(HaoBanErrCode.ERR_1, memberSendMessageVo);
} }
......
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