Merge branch 'feature/xgh/积分别名' into 'master'

会员标签换接口

See merge request !2094

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

@@ -697,7 +697,8 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
                 continue;
             }
             //该会员打的标签
-            List<MemberTagDTO> gicItems = memberTagService.listMemberTag(clerkRelated.getEnterpriseId(), memberId);
+            /*List<MemberTagDTO> gicItems = memberTagService.listMemberTag(clerkRelated.getEnterpriseId(), memberId);*/
+            List<MemberTagDTO> gicItems = memberTagService.listMemberClerkManualTag(clerkRelated.getEnterpriseId(), memberId);
             Set<String> noSyncTagItemIds = new HashSet<>();
             if (!CollectionUtils.isEmpty(gicItems)) {
                 noSyncTagItemIds = gicItems.stream().filter(item -> !entQywxSyncTagItemIds.contains(item.getTagsId())).map(dto -> dto.getTagsId()).collect(Collectors.toSet());