企微操作日志

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

@@ -123,22 +123,22 @@ public class QywxOpenTaskController {
         if (null != oldDTO) {
             String oldName = oldDTO.getName() + "-" + addTaskId;
             String title = "编辑任务【" + oldName + "】";
-            StringBuilder sb = new StringBuilder();
             int oldMemberType = oldDTO.getMemberType();
             int newMemberType = dto.getMemberType();
             String oldMemberTypeTitle = oldMemberType == 0 ? "客户筛选" : "客户分组";
             String newMemberTypeTitle = newMemberType == 0 ? "客户筛选" : "客户分组";
-            this.otherLog(oldMemberType, newMemberType, sb, "参与人群", oldMemberTypeTitle, newMemberTypeTitle);
+            String logContent1 = this.otherLog(oldMemberType, newMemberType, "参与人群", oldMemberTypeTitle, newMemberTypeTitle);
             int oldMemberRule = oldDTO.getMemberRule();
             int newMemberRule = dto.getMemberRule();
             String oldMemberRuleTitle = oldMemberRule == 1 ? "和专属导购没有好友关系的客户" : "和企业下所有导购均没有好友关系的客户";
             String newMemberRuleTitle = newMemberRule == 1 ? "和专属导购没有好友关系的客户" : "和企业下所有导购均没有好友关系的客户";
-            this.otherLog(oldMemberRule, newMemberRule, sb, "人群规则", oldMemberRuleTitle, newMemberRuleTitle);
+            String logContent2 = this.otherLog(oldMemberRule, newMemberRule, "人群规则", oldMemberRuleTitle, newMemberRuleTitle);
             String oldLabel = oldDTO.getMemberLabelId();
             String newLabel = dto.getMemberLabelId();
-            this.membrLabel(3, oldLabel, newLabel, sb);
-            if (StringUtils.isNotBlank(sb.toString())) {
-                String logContent = title + sb.toString();
+            String logContent3 = this.membrLabel(oldLabel, newLabel);
+            String logContent = this.addListForLog(logContent1, logContent2, logContent3);
+            if (StringUtils.isNotBlank(logContent)) {
+                logContent = title + logContent;
                 GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
                 GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             } else {
@@ -153,24 +153,26 @@ public class QywxOpenTaskController {
         return RestResponse.successResult(resp.getResult());
     }
 
-    private void otherLog(int oldValue, int newValue, StringBuilder sb, String s1, String s2, String s3) {
+    private String otherLog(int oldValue, int newValue, String s1, String s2, String s3) {
         if (oldValue != newValue) {
-            sb.append(s1 + "从【" + s2 + "】修改为【" + s3 + "】");
+            return s1 + "从【" + s2 + "】修改为【" + s3 + "】";
         }
+        return "";
     }
 
-    private void membrLabel(int type, String oldValue, String newValue, StringBuilder sb) {
-        if (type == 3 && !oldValue.equals(newValue)) {
+    private String membrLabel(String oldValue, String newValue) {
+        if (!oldValue.equals(newValue)) {
             MemberTagItemDTO oldResp = this.memberTagApiService.findMemberTagItem(oldValue);
             MemberTagItemDTO newResp = this.memberTagApiService.findMemberTagItem(newValue);
             if (null != oldResp) {
-                oldValue = oldResp.getTagName() + "-" + oldResp.getTagItemName();
+                oldValue = oldResp.getTagItemName();
             }
             if (null != newResp) {
-                newValue = newResp.getTagName() + "-" + newResp.getTagItemName();
+                newValue = newResp.getTagItemName();
             }
-            sb.append("标签从【" + oldValue + "】修改为【" + newValue + "】");
+            return "标签从【" + oldValue + "】修改为【" + newValue + "】";
         }
+        return "";
     }
 
 
@@ -399,9 +401,8 @@ public class QywxOpenTaskController {
             String logContent4 = this.storeLog(oldDTO.getMainStoreJson(), dto.getMainStoreJson(), "服务门店");
             String logContent5 = this.storeLog(oldDTO.getMainStoreJson(), dto.getMainStoreJson(), "协管门店");
             String logContent6 = this.storeLog(oldDTO.getMainStoreJson(), dto.getMainStoreJson(), "指定门店");
-
-            if (StringUtils.isAnyEmpty(logContent1, logContent2, logContent3, logContent4, logContent5, logContent6)) {
-                String logContent = logContent1 + logContent2 + logContent3 + logContent4 + logContent5 + logContent6;
+            String logContent = this.addListForLog(logContent1, logContent2, logContent3, logContent4, logContent5, logContent6);
+            if (StringUtils.isNotBlank(logContent)) {
                 GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
                 GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             } else {
@@ -433,22 +434,25 @@ public class QywxOpenTaskController {
         String s3 = "";
         if ("指定门店".equals(name)) {
             s3 = this.getStore(oldJson.getString("storeId"), newJson.getString("storeId"));
-
         }
         return s1 + s3 + s2;
     }
 
     private String getStore(String oldStoreId, String newStoreId) {
         if (!oldStoreId.equals(newStoreId)) {
-            StoreDTO oldStore = this.storeService.getStore(oldStoreId);
-            StoreDTO newStore = this.storeService.getStore(newStoreId);
-            String oldName = "";
-            if (null != oldStore) {
-                oldName = oldStore.getStoreName() + "、" + oldStore.getStoreCode();
+            String oldName = "--";
+            if (StringUtils.isNotBlank(oldStoreId)) {
+                StoreDTO oldStore = this.storeService.getStore(oldStoreId);
+                if (null != oldStore) {
+                    oldName = oldStore.getStoreName() + "、" + oldStore.getStoreCode();
+                }
             }
-            String newName = "";
-            if (null != newStore) {
-                newName = newStore.getStoreName() + "、" + newStore.getStoreCode();
+            String newName = "--";
+            if (StringUtils.isNotBlank(newStoreId)) {
+                StoreDTO newStore = this.storeService.getStore(newStoreId);
+                if (null != newStore) {
+                    newName = newStore.getStoreName() + "、" + newStore.getStoreCode();
+                }
             }
             String s = String.format("指定门店从【%s】修改未【%s】", oldName, newName);
             return s;
@@ -554,8 +558,9 @@ public class QywxOpenTaskController {
                     logContent3 = "状态从【启用自动删除】修改为【停用自动删除】 ";
                 }
             }
-            if (StringUtils.isNotBlank(logContent1) || StringUtils.isNotBlank(logContent2) || StringUtils.isNotBlank(logContent3)) {
-                GicLogRecordEvaluationContext.putAttribute("logValue", logContent1 + logContent2 + logContent3);
+            String logContent = this.addListForLog(logContent1, logContent2, logContent3);
+            if (StringUtils.isNotBlank(logContent)) {
+                GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
                 GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             } else {
                 GicLogRecordEvaluationContext.noWriteLog();
@@ -643,8 +648,9 @@ public class QywxOpenTaskController {
             if (!oldType.equals(newType)) {
                 logContent2 += "执行消息类型从【" + oldType + "】修改为【" + newType + "】";
             }
-            if (StringUtils.isNotBlank(logContent1) || StringUtils.isNotBlank(logContent2)) {
-                GicLogRecordEvaluationContext.putAttribute("logValue", logContent1 + " " + logContent2);
+            String logContent = this.addListForLog(logContent1, logContent2);
+            if (StringUtils.isNotBlank(logContent)) {
+                GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
                 GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             } else {
                 GicLogRecordEvaluationContext.noWriteLog();
@@ -653,5 +659,17 @@ public class QywxOpenTaskController {
         return RestResponse.successResult(resp.getResult());
     }
 
+    private String addListForLog(String... arr) {
+        List<String> list = new ArrayList<>();
+        for (String s : arr) {
+            if (StringUtils.isNotBlank(s)) {
+                list.add(s);
+            }
+        }
+        if (CollectionUtils.isNotEmpty(list)) {
+            return list.stream().collect(Collectors.joining(","));
+        }
+        return "";
+    }
 
 }