加好友申请标签

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenTaskController.java

@@ -166,8 +166,11 @@ public class QywxOpenTaskController {
             String logContent2 = this.otherLog(oldMemberRule, newMemberRule, "人群规则", oldMemberRuleTitle, newMemberRuleTitle);
             String oldLabel = oldDTO.getMemberLabelId();
             String newLabel = dto.getMemberLabelId();
-            String logContent3 = this.membrLabel(oldLabel, newLabel);
-            String logContent = this.addListForLog(logContent1, logContent2, logContent3);
+            String oldApplyLabel = oldDTO.getMemberLabelId() ;
+            String newApplyLabel = dto.getMemberLabelId() ;
+            String logContent3 = this.memberLabel("好友申请通过后添加",oldLabel, newLabel);
+            String logContent4 = this.memberLabel("发起好友申请时添加",oldLabel, newLabel);
+            String logContent = this.addListForLog(logContent1, logContent2, logContent3,logContent4);
             if (StringUtils.isNotBlank(logContent)) {
                 logContent = title + logContent;
                 GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
@@ -193,7 +196,7 @@ public class QywxOpenTaskController {
         return "";
     }
 
-    private String membrLabel(String oldValue, String newValue) {
+    private String memberLabel(String title,String oldValue, String newValue) {
         if (!oldValue.equals(newValue)) {
             MemberTagItemDTO oldResp = this.memberTagApiService.findMemberTagItem(oldValue);
             MemberTagItemDTO newResp = this.memberTagApiService.findMemberTagItem(newValue);
@@ -203,7 +206,7 @@ public class QywxOpenTaskController {
             if (null != newResp) {
                 newValue = newResp.getTagItemName();
             }
-            return "标签从【" + oldValue + "】修改为【" + newValue + "】";
+            return title+"标签从【" + oldValue + "】修改为【" + newValue + "】";
         }
         return "";
     }
@@ -231,6 +234,15 @@ public class QywxOpenTaskController {
                 vo.setMemberLabelStatus(tagItem.getStatus());
             }
         }
+        if(StringUtils.isNotBlank(vo.getApplyMemberLabelId())) {
+            MemberTagItemDTO tagItem = this.memberTagApiService.findMemberTagItem(vo.getApplyMemberLabelId());
+            if (null != tagItem) {
+                String tagId = tagItem.getTagId();
+                MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId);
+                vo.setApplyMemberLabelName(tag.getTagName() + "-" + tagItem.getTagItemName());
+                vo.setApplyMemberLabelStatus(tagItem.getStatus());
+            }
+        }
         // 会员分组
         if (vo.getMemberType() == 1) {
             List<MemberTagGroupVO> memberTagGroupVOS = this.listMemberTagGroupInfoByGoupIds(vo

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

@@ -20,6 +20,11 @@ public class AddTaskDetailVO implements Serializable {
     private String memberLabelId;
     private String memberLabelName ;
     private int memberLabelStatus ;
+
+    private String applyMemberLabelId ;
+    private String applyMemberLabelName ;
+    private int applyMemberLabelStatus ;
+
     /**开始时间*/
     private java.util.Date startTime;
     /**结束时间*/
@@ -49,6 +54,30 @@ public class AddTaskDetailVO implements Serializable {
     /** 人群id用于回显 */
     private String searchParamsId ;
 
+    public String getApplyMemberLabelId() {
+        return applyMemberLabelId;
+    }
+
+    public void setApplyMemberLabelId(String applyMemberLabelId) {
+        this.applyMemberLabelId = applyMemberLabelId;
+    }
+
+    public String getApplyMemberLabelName() {
+        return applyMemberLabelName;
+    }
+
+    public void setApplyMemberLabelName(String applyMemberLabelName) {
+        this.applyMemberLabelName = applyMemberLabelName;
+    }
+
+    public int getApplyMemberLabelStatus() {
+        return applyMemberLabelStatus;
+    }
+
+    public void setApplyMemberLabelStatus(int applyMemberLabelStatus) {
+        this.applyMemberLabelStatus = applyMemberLabelStatus;
+    }
+
     private List<MemberTagGroupVO> tagGroupList;
 
     public List<MemberTagGroupVO> getTagGroupList() {