feat：会员登录bug修改

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -169,4 +169,16 @@ public interface MemberUnionidRelatedApiService {
 	 */
 	MemberUnionidRelatedDTO getExternalUseridInfoBySelfExternalUserId(String wxEnterpriseId, String wxUserId, String selfExternalUserId);
 
+
+	/**
+	 * 根据企业内部外部联系人id 获取关联关系
+	 *
+	 * @param wxEnterpriseId     wx企业标识
+	 * @param selfExternalUserId 自外部的用户id
+	 * @return {@link MemberUnionidRelatedDTO }
+	 * @author mozhu
+	 * @date 2021-12-23 22:39:25
+	 */
+	MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId,String selfExternalUserId);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java

@@ -51,11 +51,12 @@ public interface MemberUnionidRelatedMapper {
     /**
      * 根据应用内的外部联系人获取信息
      *
+     * @param wxUserId
      * @param wxEnterpriseId
      * @param selfExternalUserId
      * @return
      */
-    MemberUnionidRelated getBySelfExternalUserId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
+    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);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/MemberUnionRelatedService.java

@@ -45,7 +45,19 @@ public interface MemberUnionRelatedService {
 	 * @param selfExternalUserId
 	 * @return
 	 */
-	MemberUnionidRelatedDTO getBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId);
+	MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId);
+
+
+	/**
+	 * 根据应用内的外部联系人id 获取信息
+	 *
+	 * @param wxEnterpriseId     wx企业标识
+	 * @param selfExternalUserId 自外部的用户id
+	 * @return {@link MemberUnionidRelatedDTO }
+	 * @author mozhu
+	 * @date 2021-12-23 22:35:47
+	 */
+	MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId);
 
 	/**
 	 * 根据应用内的外部联系人id 获取信息

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MemberUnionRelatedServiceImpl.java

@@ -86,8 +86,14 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 	}
 
 	@Override
-	public MemberUnionidRelatedDTO getBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId) {
-		MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(wxEnterpriseId, selfExternalUserId);
+	public MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId) {
+		MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(wxUserId,wxEnterpriseId, selfExternalUserId);
+		return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);
+	}
+
+	@Override
+	public MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId) {
+		MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(null,wxEnterpriseId, selfExternalUserId);
 		return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);
 	}
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -1599,7 +1599,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         String relationKey = SecureUtil.md5(dto.getClerkId() + dto.getExternalUserId());
 
-        MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getBySelfExternalUserId(wxUserId, wxEnterpriseId, dto.getSelfExternalUserId());
+        MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByWxUserIdAndSelfExternalUserId(wxUserId, wxEnterpriseId, dto.getSelfExternalUserId());
         String uuid = "";
         if (exsitDTO == null) {
             exsitDTO = new MemberUnionidRelatedDTO();
@@ -1737,6 +1737,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     @Override
     public MemberUnionidRelatedDTO getExternalUseridInfoBySelfExternalUserId(String wxEnterpriseId, String wxUserId, String selfExternalUserId) {
-        return memberUnionRelatedService.getBySelfExternalUserId(wxUserId, wxEnterpriseId, selfExternalUserId);
+        return memberUnionRelatedService.getByWxUserIdAndSelfExternalUserId(wxUserId, wxEnterpriseId, selfExternalUserId);
+    }
+
+    @Override
+    public MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId) {
+        return memberUnionRelatedService.getBySelfExternalUserId(wxEnterpriseId,selfExternalUserId);
     }
 }

haoban-manage3-service/src/main/resources/mapper/MemberUnionidRelatedMapper.xml

@@ -326,7 +326,11 @@
         from tab_haoban_member_unionid_related
         where wx_enterprise_id = #{wxEnterpriseId}
         and status_flag = 1
-        and self_external_userid = #{selfExternalUserId} order by create_time desc limit 1
+        and self_external_userid = #{selfExternalUserId}
+        <if test="wxUserId != null">
+            and wx_user_id = #{wxUserId}
+        </if>
+        order by create_time desc limit 1
     </select>
 
     <select id="listBySelfExternalUserId" resultMap="BaseResultMap">
@@ -335,7 +339,7 @@
         from tab_haoban_member_unionid_related
         where wx_enterprise_id = #{wxEnterpriseId}
         and status_flag = 1
-        and wx_user_id = #{wxUserId, jdbcType=CHAR}
+        and wx_user_id = #{wxUserId}
         and self_external_userid = #{selfExternalUserId}
     </select>
 </mapper>
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -407,7 +407,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
             logger.info("企业不存在没有绑定");
             return resultResponse(HaoBanErrCode.ERR_400002);
         }
-        MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getExternalUseridInfoBySelfExternalUserId(wxEnterpriseId, wxUserId, externalUserid);
+        MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getBySelfExternalUserId(wxEnterpriseId, externalUserid);
         if (null == memberUnionidRelatedDTO) {
             logger.info("请刷新好友");
             return resultResponse(HaoBanErrCode.ERR_11123);