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

标签同步

See merge request !1441

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

@@ -15,11 +15,13 @@ import com.gic.haoban.manage.api.enums.QywxTagRelationSyncFlagEnum;
 import com.gic.haoban.manage.api.enums.QywxTagRelationTypeEnum;
 import com.gic.haoban.manage.api.service.QywxTagApiService;
 import com.gic.haoban.manage.service.config.Config;
+import com.gic.haoban.manage.service.dao.mapper.QywxTagRelationMapper;
 import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.pojo.QywxSyncTagFormatPojo;
 import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.QywxTagService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.haoban.manage.service.util.DingUtils;
 import com.gic.member.api.dto.MemberTagDTO;
 import com.gic.member.api.service.MemberTagService;
 import com.gic.member.tag.api.dto.MemberTagItemDTO;
@@ -85,6 +87,8 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
     @Autowired
     private MemberTagItemApiService memberTagItemApiService;
+    @Autowired
+    private QywxTagRelationMapper qywxTagRelationMapper;
 
     @Override
     public void pullQywxTag(String wxEnterpriseId) {
@@ -107,8 +111,15 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
     @Override
     public ServiceResponse syncTagToQywx(String wxEnterpriseId, String enterpriseId, QywxTagInfoDTO infoDTO, List<QywxTagItemDTO> items) {
+        logger.info("保存标签同步");
         ServiceResponse ret = new ServiceResponse();
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        // 如果
+        List<TabQywxTagRelation> list = this.qywxTagRelationMapper.listByMemberTagId(wxEnterpriseId,infoDTO.getMemberTagId()) ;
+        if(CollectionUtils.isNotEmpty(list) && list.size()==items.size()) {
+            logger.info("标签已存在,直接处理会员");
+            return ret ;
+        }
         //调用企业微信接口保存
         QywxGetCorpTagListDTO resp = this.saveQywxTag(qwDTO.getThirdCorpid(), infoDTO, items,qwDTO);
         if (resp.getErrcode() != 0 && CollectionUtils.isEmpty(resp.getTagGroup())) {