增加人群标签

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatActivityBaseDTO.java

@@ -96,7 +96,7 @@ public class GroupChatActivityBaseDTO implements Serializable {
      */
     private Integer labelFlag;
     /**
-     * { "options": 1, "id": 1, "name": "标签名称" }
+     * {"id": 1, "name": "标签名称" }
      */
     private String labelJson;
     /**

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/chat/GroupChatActivityQDTO.java

@@ -88,7 +88,7 @@ public class GroupChatActivityQDTO implements Serializable {
      */
     private Integer labelFlag;
     /**
-     * { "options": 1, "id": 1, "name": "标签名称" }
+     * {"id": 1, "name": "标签名称" }
      */
     private String labelJson;
     /**

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/chat/TabGroupChatActivity.java

@@ -88,7 +88,7 @@ public class TabGroupChatActivity implements Serializable {
      */
     private Integer labelFlag;
     /**
-     * { "options": 1, "id": 1, "name": "标签名称" }
+     * {"id": 1, "name": "标签名称" }
      */
     private String labelJson;
     /**

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatActivityController.java

@@ -23,6 +23,7 @@ import com.gic.haoban.manage.web.log.LogRecordUserServiceImpl;
 import com.gic.haoban.manage.web.qo.chat.GroupChatActivitySaveQO;
 import com.gic.haoban.manage.web.qo.chat.GroupChatActivitySearchQO;
 import com.gic.haoban.manage.web.utils.CreatorUtils;
+import com.gic.haoban.manage.web.vo.MemberLabelVO;
 import com.gic.haoban.manage.web.vo.MemberTagGroupVO;
 import com.gic.haoban.manage.web.vo.chat.GroupChatActivityVO;
 import com.gic.haoban.manage.web.vo.chat.GroupChatHmVO;
@@ -32,7 +33,10 @@ import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
 import com.gic.marketing.api.dto.card.CardStockAndInvalidDTO;
 import com.gic.marketing.api.service.CouponCardService;
+import com.gic.member.tag.api.dto.MemberTagDTO;
 import com.gic.member.tag.api.dto.MemberTagGroupDTO;
+import com.gic.member.tag.api.dto.MemberTagItemDTO;
+import com.gic.member.tag.api.service.MemberTagApiService;
 import com.gic.member.tag.api.service.MemberTagGroupApiService;
 import com.gic.web.common.utils.SessionContextUtils;
 import com.google.common.collect.Lists;
@@ -68,6 +72,8 @@ public class GroupChatActivityController {
 
     @Autowired
     private EnterpriseWxaLinkService enterpriseWxaLinkService ;
+    @Autowired
+    private MemberTagApiService memberTagApiService;
 
     /**
      * 社群活动分页查询
@@ -170,8 +176,16 @@ public class GroupChatActivityController {
                 activityVO.setChatHmMap(chatHmMap);
             }
         }
-
-
+        //构建标签回显
+        String labelJson = activityVO.getLabelJson();
+        if (StringUtils.isNotBlank(labelJson)) {
+            String id = JSONObject.parseObject(labelJson).getString("id");
+            List<MemberLabelVO> memberLabelList = getMemberLabelList(id);
+            if (CollectionUtils.isNotEmpty(memberLabelList)) {
+                Map<String, MemberLabelVO> labelMap = memberLabelList.stream().collect(Collectors.toMap(MemberLabelVO::getLabelId, v -> v, (e, x) -> e));
+                activityVO.setLabelMap(labelMap);
+            }
+        }
     }
     public List<MemberTagGroupVO> listMemberTagGroupInfoByGroupIds(String tagGroupIds) {
 
@@ -203,6 +217,41 @@ public class GroupChatActivityController {
         return result;
     }
 
+    private List<MemberLabelVO> getMemberLabelList(String memberTags) {
+        if (StringUtils.isBlank(memberTags)) {
+            return null;
+        }
+        List<String> list = new ArrayList<>();
+        String[] arr = memberTags.split(",");
+        for (int i = 0; i < arr.length; i++) {
+            String s = arr[i];
+            if (StringUtils.isNotBlank(s)) {
+                list.add(s);
+            }
+        }
+        List<MemberLabelVO> memberLabelVOList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (String memberLabelId : list) {
+                MemberTagItemDTO tagItem = this.memberTagApiService.findMemberTagItem(memberLabelId);
+                if (null != tagItem) {
+                    String tagId = tagItem.getTagId();
+                    MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId);
+                    MemberLabelVO vo = new MemberLabelVO();
+                    vo.setLabelName(tag.getTagName());
+                    vo.setLabelValueName(tagItem.getTagItemName());
+                    vo.setLabelValueStatus(tagItem.getStatus());
+                    if(tagItem.getStatus()!=0) {
+                        vo.setLabelValueStatus(1);
+                    }
+                    vo.setLabelValueId(memberLabelId);
+                    vo.setLabelId(tagId);
+                    memberLabelVOList.add(vo);
+                }
+            }
+        }
+        return memberLabelVOList;
+    }
+
     /**
      * 社群活动终止
      *

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/MemberLabelVO.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+public class MemberLabelVO implements Serializable {
+
+    private String labelValueId;
+    private String labelValueName ;
+
+    private int   labelValueStatus ;
+    private String labelName ;
+    private String labelId ;
+
+    public String getLabelId() {
+        return labelId;
+    }
+
+    public void setLabelId(String labelId) {
+        this.labelId = labelId;
+    }
+
+    public String getLabelValueId() {
+        return labelValueId;
+    }
+
+    public void setLabelValueId(String labelValueId) {
+        this.labelValueId = labelValueId;
+    }
+
+    public String getLabelValueName() {
+        return labelValueName;
+    }
+
+    public void setLabelValueName(String labelValueName) {
+        this.labelValueName = labelValueName;
+    }
+
+    public int getLabelValueStatus() {
+        return labelValueStatus;
+    }
+
+    public void setLabelValueStatus(int labelValueStatus) {
+        this.labelValueStatus = labelValueStatus;
+    }
+
+    public String getLabelName() {
+        return labelName;
+    }
+
+    public void setLabelName(String labelName) {
+        this.labelName = labelName;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityVO.java

 package com.gic.haoban.manage.web.vo.chat;
 
 import com.gic.haoban.manage.api.dto.chat.GroupChatActivityDTO;
+import com.gic.haoban.manage.web.vo.MemberLabelVO;
 import com.gic.marketing.api.dto.card.CardStockAndInvalidDTO;
 
 import java.io.Serializable;
@@ -20,6 +21,11 @@ public class GroupChatActivityVO extends GroupChatActivityDTO implements Seriali
     private Map<String,GroupChatHmVO> chatHmMap;
 
     /**
+     * 标签Map
+     */
+    private Map<String, MemberLabelVO> labelMap;
+
+    /**
      * 人群回显 会员筛选key:searchId,客户分组key:tagGroupList
      */
     private List<Map<String, Object>> memberWeightViewList;
@@ -47,4 +53,12 @@ public class GroupChatActivityVO extends GroupChatActivityDTO implements Seriali
     public void setMemberWeightViewList(List<Map<String, Object>> memberWeightViewList) {
         this.memberWeightViewList = memberWeightViewList;
     }
+
+    public Map<String, MemberLabelVO> getLabelMap() {
+        return labelMap;
+    }
+
+    public void setLabelMap(Map<String, MemberLabelVO> labelMap) {
+        this.labelMap = labelMap;
+    }
 }