Merge branch 'feature/2022-0104' into developer

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

@@ -89,7 +89,7 @@ public interface ExternalClerkRelatedApiService {
      *
      * @return
      */
-    List<ExternalClerkRelatedDTO> listExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String wxUserId, String enterpriseId, String externalUserId);
+    ExternalClerkRelatedDTO getExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String wxUserId, String enterpriseId, String externalUserId);
 
     /**
      * 根据id查询列表

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

@@ -68,5 +68,7 @@ public interface MemberUnionidRelatedMapper {
      * @author mozhu
      * @date 2021-12-29 16:30:43
      */
-    int updateExternalUserIdByOldExternalUserId(String new_external_userid, String external_userid, String wxEnterpriseId);
+    int updateExternalUserIdByOldExternalUserId(@Param("newExternalUserId") String new_external_userid,
+                                                @Param("oldExternalUserId") String external_userid,
+                                                @Param("wxEnterpriseId") String wxEnterpriseId);
 }
\ No newline at end of file

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

@@ -100,7 +100,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
      * @param externalUserId
      * @return
      */
-    List<TabHaobanExternalClerkRelated> listExternalClerkByWxUserIdAncExternalUserId(
+    TabHaobanExternalClerkRelated getExternalClerkByWxUserIdAncExternalUserId(
             @Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId,
             @Param("enterpriseId") String enterpriseId, @Param("externalUserId") String externalUserId);
 

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

@@ -440,7 +440,7 @@
           and status_flag in (3, 4)
     </update>
 
-    <select id="listExternalClerkByWxUserIdAncExternalUserId" resultMap="BaseResultMap">
+    <select id="getExternalClerkByWxUserIdAncExternalUserId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_external_clerk_related
@@ -449,7 +449,7 @@
         and enterprise_id = #{enterpriseId}
         and external_user_id = #{externalUserId}
         and status_flag in(1,3,4)
-        order by update_time desc
+        order by update_time desc limit 1
     </select>
 
     <select id="listByMemberIdAndWxEnterpriseId" resultMap="BaseResultMap">

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

@@ -413,21 +413,20 @@ public class WxEnterpriseInfoController extends WebBaseController {
             logger.info("请刷新好友");
             return resultResponse(HaoBanErrCode.ERR_11123);
         }
-        List<ExternalClerkRelatedDTO> clerkRelatedDTOS = externalClerkRelatedApiService.listExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, wxUserId, gicEnterpriseId, memberUnionidRelatedDTO.getExternalUserid());
-        if (CollectionUtils.isEmpty(clerkRelatedDTOS)) {
-            logger.info("该企业没有对应需要发送的信息村子啊");
+        ExternalClerkRelatedDTO clerkRelatedDTO = externalClerkRelatedApiService.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, wxUserId, gicEnterpriseId, memberUnionidRelatedDTO.getExternalUserid());
+        if (clerkRelatedDTO == null) {
+            logger.info("该企业没有对应需要发送好友关系的信息");
             return resultResponse(HaoBanErrCode.ERR_11123);
         }
-
         MiniprogramSettingDTO settingDTO = wxEnterpriseApiService.getMiniprogramSettingByEid(wxEnterpriseId, gicEnterpriseId);
         if (null == settingDTO) {
-            logger.info("该企业没有对应需要发送的信息村子啊");
+            logger.info("该企业没有对应需要发送的小程序信息");
             return resultResponse(HaoBanErrCode.ERR_11124);
         }
         EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(gicEnterpriseId);
-        ExternalClerkRelatedDTO clerkRelatedDTO = clerkRelatedDTOS.get(0);
         MemberSendMessageVo memberSendMessageVo = new MemberSendMessageVo();
-        memberSendMessageVo.setRelationKey(clerkRelatedDTO.getRelationKey());
+        String relationKey = clerkRelatedDTO.getRelationKey();
+        memberSendMessageVo.setRelationKey(StringUtils.isNotBlank(relationKey) ? relationKey : "-1");
         memberSendMessageVo.setImageUrl(settingDTO.getImageUrl());
         memberSendMessageVo.setMediaId(settingDTO.getMediaId());
         memberSendMessageVo.setSelfExteralUserId(externalUserid);