log

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -211,13 +211,13 @@ public class HmLinkController {
             JSONObject oldStoreRuleObj = JSONObject.parseObject(oldValue);
             JSONObject newStoreRuleObj = JSONObject.parseObject(newValue);
             logger.info("{},{}", oldStoreRuleObj, newStoreRuleObj);
-            otherStoreRuleLog(oldStoreRuleObj, newStoreRuleObj, sb);
+            otherStoreRuleLog(oldStoreRuleObj, newStoreRuleObj);
             return sb.toString();
         }
         return null;
     }
 
-    private static String otherStoreRuleLog(JSONObject oldStoreRuleObj, JSONObject newStoreRuleObj, StringBuilder sb) {
+    private static String otherStoreRuleLog(JSONObject oldStoreRuleObj, JSONObject newStoreRuleObj) {
         StringBuilder tempSb = new StringBuilder();
         int oldOpenFlag = oldStoreRuleObj.getIntValue("open");
         int newOpenFlag = newStoreRuleObj.getIntValue("open");
@@ -234,27 +234,26 @@ public class HmLinkController {
                 // 开启
                 tempSb.append("开启");
                 if (newStoreType == 1) {
-                    tempSb.append(otherOpenLog(newStore, sb, 5));
+                    tempSb.append(otherOpenLog(newStore, 5));
                 } else if (newStoreType == 2) {
-                    tempSb.append(otherOpenLog(newStore, sb, 6));
+                    tempSb.append(otherOpenLog(newStore, 6));
                 }
-                String cityLog = otherOpenLog(newCityStore, sb, 4);
+                String cityLog = otherOpenLog(newCityStore, 4);
                 tempSb.append(cityLog);
             } else {
                 if (newStoreType == 1) {
-                    tempSb.append(ruleLogOther(oldtore, newStore, sb, 5));
+                    tempSb.append(ruleLogOther(oldtore, newStore, 5));
                 } else if (newStoreType == 2) {
-                    tempSb.append(ruleLogOther(oldtore, newStore, sb, 6));
+                    tempSb.append(ruleLogOther(oldtore, newStore, 6));
                 }
-                tempSb.append(ruleLogOther(oldCityStore, newCityStore, sb, 4));
+                tempSb.append(ruleLogOther(oldCityStore, newCityStore, 4));
             }
 
         }
-        sb.append(tempSb);
-        return tempSb.toString() ;
+        return tempSb.toString();
     }
 
-    private static String otherOpenLog(HmLinkStoreSettingDTO newStore, StringBuilder sb, int level) {
+    private static String otherOpenLog(HmLinkStoreSettingDTO newStore, int level) {
         StringBuilder tempSb = new StringBuilder();
         String title = "";
         if (level == 4) {
@@ -278,13 +277,11 @@ public class HmLinkController {
             newTitle = getLogOption(0, 0, newNdz, newNdy, newNdz, newNdy, level);
         }
         tempSb.append("「").append(title).append("-").append(newTitle).append("」");
-        sb.append(tempSb);
         return tempSb.toString();
 
     }
 
-    private static String ruleLogOther(HmLinkStoreSettingDTO oldStore, HmLinkStoreSettingDTO newStore, StringBuilder sb,
-            int level) {
+    private static String ruleLogOther(HmLinkStoreSettingDTO oldStore, HmLinkStoreSettingDTO newStore, int level) {
         StringBuilder tempSb = new StringBuilder();
         String title = "";
         if (level == 5) {
@@ -312,10 +309,10 @@ public class HmLinkController {
             newTitle = getLogOption(0, 0, newNdz, newNdy, newNdz, newNdy, level);
         }
         if (!oldTitle.equals(newTitle)) {
-            sb.append("分配规则").append("「").append(title).append("-").append(oldTitle).append("」").append("变更为")
+            tempSb.append("分配规则").append("「").append(title).append("-").append(oldTitle).append("」").append("变更为")
                     .append("「").append(title).append("-").append(newTitle).append("」");
         }
-        sb.append(tempSb);
+        tempSb.append(tempSb);
         return tempSb.toString();
 
     }
@@ -388,31 +385,34 @@ public class HmLinkController {
         }
         String s1 = "(同意授权)";
         if (dz == 1) {
-            if(level==6) {
-                list.add(s1) ;
+            if (level == 6) {
+                list.add(s1 + "店长");
+            } else {
+                list.add("店长");
             }
-            list.add("店长");
         }
         if (dy == 1) {
-            if(level==6 && !list.contains(s1)) {
-                list.add(s1) ;
-            }
-            if (level == 1 && level == 2) {
-                list.add("其他导购");
+            if (level == 6 && !list.toString().contains(s1)) {
+                list.add(s1 + "导购");
             } else {
-                list.add("导购");
+                if (level == 1 && level == 2) {
+                    list.add("其他导购");
+                } else {
+                    list.add("导购");
+                }
             }
+
         }
         String s2 = "(拒绝授权)";
         if (ndz == 1) {
-            list.add(s2) ;
-            list.add("店长");
+            list.add(s2 + "店长");
         }
         if (ndy == 1) {
-            if(!list.contains(s2)) {
-                list.add(s2) ;
+            if (!list.toString().contains(s2)) {
+                list.add(s2 + "导购");
+            } else {
+                list.add("导购");
             }
-            list.add("导购");
         }
         return list.stream().collect(Collectors.joining("、"));
     }