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/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

@@ -12,10 +12,14 @@ import com.gic.haoban.app.customer.enums.QywxSyncTaskTypeEnum;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.AlertMessageDTO;
+import com.gic.haoban.manage.api.dto.ClerkStaffWxUserDTO;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
 import com.gic.haoban.manage.api.enums.AlertTypeEnum;
 import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.*;
 import com.gic.haoban.manage.service.entity.*;
@@ -63,6 +67,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private ExternalUseridLogMapper externalUseridLogMapper;
     @Autowired
     private CheckQywxSettingApiService checkQywxSettingApiService;
+    @Autowired
+    private WxEnterpriseApiService wxEnterpriseApiService;
 
     /**
      * 查询导购好友关联
@@ -203,9 +209,9 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     }
 
     @Override
-    public List<ExternalClerkRelatedDTO> listExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String wxUserId, String enterpriseId, String externalUserId) {
-        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, wxUserId, enterpriseId, externalUserId);
-        return EntityUtil.changeEntityListNew(ExternalClerkRelatedDTO.class, list);
+    public ExternalClerkRelatedDTO getExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String wxUserId, String enterpriseId, String externalUserId) {
+        TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, wxUserId, enterpriseId, externalUserId);
+        return EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class, externalClerkRelated);
     }
 
     @Override
@@ -320,10 +326,10 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         }
         String lockKey = "updateNewExternalUserid_" + wxEnterpriseId;
         if (RedisUtil.isLocked(lockKey)) {
-            log.info("redis锁，lockKey：{}",lockKey);
+            log.info("redis锁，lockKey：{}", lockKey);
             return false;
         }
-        RedisUtil.lock(lockKey,1L,TimeUnit.DAYS,0L);
+        RedisUtil.lock(lockKey, 1L, TimeUnit.DAYS, 0L);
         try {
             updateNewExUserId(tabHaobanWxEnterprise.getWxEnterpriseId(), tabHaobanWxEnterprise.getCorpid());
             log.info("企业外部联系人id end,wxEnterpriseId:{}", wxEnterpriseId);
@@ -339,55 +345,60 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     @Override
     public void updateNewExternalUseridMq(String res) {
         log.info("更新新的外部联系人id mq,start");
-        JSONObject jsonObject = JSON.parseObject(res);
-        String corpid = jsonObject.getString("corpid");
-        String wxEnterpriseId = jsonObject.getString("wxEnterpriseId");
-        Boolean isLastPage = jsonObject.getBoolean("isLastPage");
-        log.info("更新新的外部联系人id mq,corpid:{},wxEnterpriseId:{}", corpid, wxEnterpriseId);
-        String externalUserIdLists = jsonObject.getString("externalUserIdList");
-        List<String> externalUserIdList = JSON.parseArray(externalUserIdLists, String.class);
-        //查询企微接口，更新新的external_user_id
-        List<QywxNewExternalUseridDTO> newExternalUseridList = qywxUserApiService.getNewExternalUseridByList(corpid, config.getWxSuiteid(), externalUserIdList);
-        if (CollectionUtils.isEmpty(newExternalUseridList)) {
-            log.info("更新新的外部联系人id，查询企业微信接口报错");
-            wxEnterriseMapper.updateExternalFlagById(3, wxEnterpriseId);
-            return;
-        }
-        List<TabExternalUseridLog> tabExternalUseridLogList = new ArrayList<>();
-        for (QywxNewExternalUseridDTO qywxNewExternalUseridDTO : newExternalUseridList) {
-            String new_external_userid = qywxNewExternalUseridDTO.getNew_external_userid();
-            String external_userid = qywxNewExternalUseridDTO.getExternal_userid();
-            //好友关系表
-            tabHaobanExternalClerkRelatedMapper.updateExternalUserIdByOldExternalUserId(new_external_userid, external_userid, wxEnterpriseId);
-            //会员关系表
-            memberUnionidRelatedMapper.updateExternalUserIdByOldExternalUserId(new_external_userid, external_userid, wxEnterpriseId);
-            TabExternalUseridLog tabExternalUseridLog = new TabExternalUseridLog();
-            tabExternalUseridLog.setId(UniqueIdUtils.uniqueLong());
-            tabExternalUseridLog.setOldExternalUserId(external_userid);
-            tabExternalUseridLog.setNewExternalUserId(new_external_userid);
-            tabExternalUseridLog.setWxEnterpriseId(wxEnterpriseId);
-            tabExternalUseridLog.setCreatorId("admin");
-            tabExternalUseridLog.setCreatorName("系统管理员");
-            tabExternalUseridLogList.add(tabExternalUseridLog);
-        }
-        externalUseridLogMapper.insertBatch(tabExternalUseridLogList);
-        //最后一页
-        if (isLastPage) {
-            //serviceCorpid 默认为：达摩网络
-            boolean flag = qywxUserApiService.finishExternalUseridMigration(corpid, config.getCorpid());
-            log.info("更新新的外部联系人id最后一页，设置迁移完成：flag:{}", flag);
-            if (flag) {
-                //成功
-                wxEnterriseMapper.updateExternalFlagById(1, wxEnterpriseId);
-            } else {
-                //失败
+        try {
+            JSONObject jsonObject = JSON.parseObject(res);
+            String corpid = jsonObject.getString("corpid");
+            String wxEnterpriseId = jsonObject.getString("wxEnterpriseId");
+            Boolean isLastPage = jsonObject.getBoolean("isLastPage");
+            log.info("更新新的外部联系人id mq,corpid:{},wxEnterpriseId:{}", corpid, wxEnterpriseId);
+            String externalUserIdLists = jsonObject.getString("externalUserIdList");
+            List<String> externalUserIdList = JSON.parseArray(externalUserIdLists, String.class);
+            //查询企微接口，更新新的external_user_id
+            List<QywxNewExternalUseridDTO> newExternalUseridList = qywxUserApiService.getNewExternalUseridByList(corpid, config.getWxSuiteid(), externalUserIdList);
+            if (CollectionUtils.isEmpty(newExternalUseridList)) {
+                log.info("更新新的外部联系人id，查询企业微信接口报错");
                 wxEnterriseMapper.updateExternalFlagById(3, wxEnterpriseId);
-                externalUseridLogMapper.updateStatusFlagByWxEnterpriseId(0, wxEnterpriseId);
-                //回退老的
-                externalUseridLogMapper.updateOldExternalUserId(wxEnterpriseId);
+                return;
+            }
+            List<TabExternalUseridLog> tabExternalUseridLogList = new ArrayList<>();
+            for (QywxNewExternalUseridDTO qywxNewExternalUseridDTO : newExternalUseridList) {
+                String new_external_userid = qywxNewExternalUseridDTO.getNew_external_userid();
+                String external_userid = qywxNewExternalUseridDTO.getExternal_userid();
+                //好友关系表
+                tabHaobanExternalClerkRelatedMapper.updateExternalUserIdByOldExternalUserId(new_external_userid, external_userid, wxEnterpriseId);
+                //会员关系表
+                memberUnionidRelatedMapper.updateExternalUserIdByOldExternalUserId(new_external_userid, external_userid, wxEnterpriseId);
+                TabExternalUseridLog tabExternalUseridLog = new TabExternalUseridLog();
+                tabExternalUseridLog.setId(UniqueIdUtils.uniqueLong());
+                tabExternalUseridLog.setOldExternalUserId(external_userid);
+                tabExternalUseridLog.setNewExternalUserId(new_external_userid);
+                tabExternalUseridLog.setWxEnterpriseId(wxEnterpriseId);
+                tabExternalUseridLog.setCreatorId("admin");
+                tabExternalUseridLog.setCreatorName("系统管理员");
+                tabExternalUseridLogList.add(tabExternalUseridLog);
+            }
+            externalUseridLogMapper.insertBatch(tabExternalUseridLogList);
+            //最后一页
+            if (isLastPage) {
+                //serviceCorpid 默认为：达摩网络
+                boolean flag = qywxUserApiService.finishExternalUseridMigration(corpid, config.getCorpid());
+                log.info("更新新的外部联系人id最后一页，设置迁移完成：flag:{}", flag);
+                if (flag) {
+                    //成功
+                    wxEnterpriseApiService.agreeExternalUseridFlag(wxEnterpriseId, 1);
+                } else {
+                    //失败
+                    wxEnterriseMapper.updateExternalFlagById(3, wxEnterpriseId);
+                    externalUseridLogMapper.updateStatusFlagByWxEnterpriseId(0, wxEnterpriseId);
+                    //回退老的
+                    externalUseridLogMapper.updateOldExternalUserId(wxEnterpriseId);
+                }
             }
+            log.info("更新新的外部联系人id mq,end");
+        } catch (Exception e) {
+            log.info("更新新的外部联系人id mq报错：{},res:{}", e.getMessage(), res, e);
         }
-        log.info("更新新的外部联系人id mq,end");
+
     }
 
     /**
@@ -400,7 +411,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
      */
     private void updateNewExUserId(String wxEnterpriseId, String corpid) {
         wxEnterriseMapper.updateExternalFlagById(2, wxEnterpriseId);
-        messageAlert(wxEnterpriseId,"更新新的外部联系人id");
+        messageAlert(wxEnterpriseId, "更新新的外部联系人id");
         // 限流器
         RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter("haoban:manage3:updateNewExUserId:limit");
         // 每1秒产生5个令牌
@@ -462,7 +473,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
      * @param wxEnterpriseId wx企业标识
      * @param titleSub       子标题
      */
-    private void messageAlert(String wxEnterpriseId,String titleSub) {
+    private void messageAlert(String wxEnterpriseId, String titleSub) {
         ProviderLocalTag providerLocalTag = ProviderLocalTag.tag.get();
         String traceId = providerLocalTag.traceId;
         AlertMessageDTO messageDTO = new AlertMessageDTO();

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);