Merge branch 'bugfix/2023-08-31' into 'master'

Bugfix/2023 08 31

See merge request !1437

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

@@ -3,10 +3,7 @@ package com.gic.haoban.manage.api.service;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
-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.dto.FriendMemberStatusDTO;
+import com.gic.haoban.manage.api.dto.*;
 
 import java.util.Date;
 import java.util.List;
@@ -323,4 +320,5 @@ public interface ExternalClerkRelatedApiService {
      * @return
      */
     com.gic.api.base.commons.ServiceResponse<String> getMemberIdByExternalId(String wxEnterpriseId,String externalUserId);
+
 }

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service;
 
 import java.util.List;
 
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.pojo.bo.WxEnterpriseRelationBO;
@@ -42,4 +43,11 @@ public interface WxEnterpriseRelatedService {
 	public WxEnterpriseRelationBO getHeadEnterprise(String enterpriseId) ;
 	
 	public boolean getAddByWelcomeFlag(TabHaobanWxEnterpriseRelated wxEnterpriseRelated , String unionid , boolean isHmUnionid) ;
+
+	/**
+	 * 获取GIC商户企微类型 0无好办 1独立应用 2第三方  3(独立应用+第三方)
+	 * @param enterpriseId
+	 * @return
+	 */
+	public ServiceResponse<Integer> getEnterprieseQwType(String enterpriseId) ;
 }

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.api.dto.EnterpriseSettingDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
@@ -122,4 +123,33 @@ public class WxEnterpriseRelatedServiceImpl implements WxEnterpriseRelatedServic
         }
         return true ;
     }
+
+    @Override
+    public ServiceResponse<Integer> getEnterprieseQwType(String enterpriseId) {
+        List<TabHaobanWxEnterpriseRelated> list = this.mapper.listByEnterpriseId(enterpriseId) ;
+        if(CollectionUtils.isEmpty(list)) {
+            return ServiceResponse.success(0) ;
+        }
+        logger.info("gic商户={}关联={}",enterpriseId,list.size());
+        Set<String> wxEidList = list.stream().map(o->o.getWxEnterpriseId()).collect(Collectors.toSet()) ;
+        List<TabHaobanWxEnterprise> wxList = this.wxEnterpriseMapper.listByIds(wxEidList) ;
+        if(CollectionUtils.isEmpty(wxList)) {
+            return ServiceResponse.success(0) ;
+        }
+        boolean selfFlag = false , thirdFlag = false ;
+        for (TabHaobanWxEnterprise o : wxList) {
+            if(o.getWxSecurityType()==5) {
+                selfFlag = true ;
+            }else {
+                thirdFlag = true ;
+            }
+        }
+        if(selfFlag && thirdFlag) {
+            return ServiceResponse.success(3) ;
+        }else if(selfFlag) {
+            return ServiceResponse.success(1) ;
+        }else {
+            return ServiceResponse.success(2) ;
+        }
+    }
 }

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

 package com.gic.haoban.manage.service.service.out.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.dto.SubscribeMessageDTO;
@@ -25,7 +24,10 @@ import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 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.dao.mapper.ExternalUseridLogMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
+import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO;
@@ -54,6 +56,7 @@ import org.redisson.api.RateType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;

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

@@ -141,7 +141,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
      * @param infoDTO
      */
     private void saveRelation(String wxEnterpriseId, String enterpriseId, QywxTagInfoDTO infoDTO, List<QywxTagItemDTO> items, Pair<TabQywxTag, List<TabQywxTagItem>> localQywxTagPair) {
-        Map<String, QywxTagItemDTO> orgMap = items.stream().collect(Collectors.toMap(item -> item.getQywxTagName(), dto -> dto));
+        Map<String, QywxTagItemDTO> orgMap = items.stream().collect(Collectors.toMap(item -> item.getQywxTagName(), dto -> dto,(k1,k2)->k1));
         //设置关联关系
         TabQywxTag groupKey = localQywxTagPair.getKey();
         List<TabQywxTagItem> tabQywxTagItems = localQywxTagPair.getRight();
@@ -438,7 +438,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
     @Override
     public ServiceResponse syncFriendTagToQywxByExternalUserId(String wxEnterpriseId, String enterpriseId, String externalUserId, List<String> tagItemIds) {
-        logger.info("同步好友标签到企业微信：{},{},{},{}", wxEnterpriseId, enterpriseId, externalUserId, JSONObject.toJSONString(tagItemIds));
+        logger.info("同步好友标签到企业微信：externalUserId={},{}", externalUserId, JSONObject.toJSONString(tagItemIds));
         ServiceResponse resp = new ServiceResponse();
         //获取需要同步的标签
         QywxSyncTagFormatPojo syncTagFormat = listSyncTagItems(wxEnterpriseId);

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

@@ -527,8 +527,7 @@
         from tab_haoban_external_clerk_related
         where wx_enterprise_id = #{wxEnterpriseId}
           and enterprise_id = #{enterpriseId}
-          and status_flag in (1, 3, 4)
-        order by create_time
+          and status_flag = 1
     </select>
 
     <select id="listMemberIdsByMemberIds" resultType="String">