企微操作日志

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

@@ -12,6 +12,7 @@ import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
+import com.gic.enterprise.api.service.EnterpriseUseForbidService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.EntityUtil;
@@ -56,6 +57,8 @@ public class QywxOpenController {
     private EnterpriseService enterpriseService ;
     @Autowired
     private OpenStaffExcelHandler openStaffExcelHandler ;
+    @Autowired
+    private EnterpriseUseForbidService enterpriseUseForbidService;
 
     /**
      * 托管列表

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

@@ -396,7 +396,7 @@ public class QywxOpenTaskController {
             String n3 = this.openLog(oldDTO.getReAddFlag(), dto.getReAddFlag(), "自动重新添加");
             String logContent3 = "";
             if (!StringUtils.isAllBlank(n1, n2, n3)) {
-                logContent3 = n3 + n1 + n2;
+                logContent3 = this.addListForLog(n1, n2, n3);
             }
             String logContent4 = this.storeLog(oldDTO.getMainStoreJson(), dto.getMainStoreJson(), "服务门店");
             String logContent5 = this.storeLog(oldDTO.getMainStoreJson(), dto.getMainStoreJson(), "协管门店");
@@ -420,7 +420,7 @@ public class QywxOpenTaskController {
     private String storeLog(String oldStr, String newStr, String name) {
         JSONObject oldJson = JSONObject.parseObject(oldStr);
         int oldFlag = oldJson.getIntValue("open");
-        JSONObject newJson = JSONObject.parseObject(oldStr);
+        JSONObject newJson = JSONObject.parseObject(newStr);
         int newFlag = newJson.getInteger("open");
         String s1 = this.openLog(oldFlag, newFlag, name);
 
@@ -435,7 +435,7 @@ public class QywxOpenTaskController {
         if ("指定门店".equals(name)) {
             s3 = this.getStore(oldJson.getString("store"), newJson.getString("store"));
         }
-        return s1 + s3 + s2;
+        return this.addListForLog(s1, s3, s2);
     }
 
     private String getStore(String oldStoreId, String newStoreId) {
@@ -497,7 +497,7 @@ public class QywxOpenTaskController {
         if (old != newValue) {
             return String.format(title, old + "", newValue + "");
         }
-        return null;
+        return "";
     }
 
     /**
@@ -548,20 +548,20 @@ public class QywxOpenTaskController {
             String oldAddTime = oldDTO.getAddTime();
             String newAddTime = dto.getAddTime();
             if (!oldAddTime.equals(newAddTime)) {
-                logContent1 = "删除时段从【" + oldAddTime + "】修改为【" + newAddTime + "】 ";
+                logContent1 = "删除时段从【" + oldAddTime + "】修改为【" + newAddTime + "】";
             }
             String oldInt = oldDTO.getAddIntervalStart() + "-" + oldDTO.getAddIntervalEnd();
             String newInt = dto.getAddIntervalStart() + "-" + dto.getAddIntervalEnd();
             if (!oldInt.equals(newInt)) {
-                logContent2 = "删除间隔从【" + oldInt + "】修改为【" + newInt + "】 ";
+                logContent2 = "删除间隔从【" + oldInt + "】修改为【" + newInt + "】";
             }
             int oldOpenFlag = oldDTO.getOpenFlag();
             int newOpenFlag = dto.getOpenFlag();
             if (oldOpenFlag != newOpenFlag) {
                 if (newOpenFlag == 1) {
-                    logContent3 = "状态从【停用自动删除】修改为【启用自动删除】 ";
+                    logContent3 = "状态从【停用自动删除】修改为【启用自动删除】";
                 } else {
-                    logContent3 = "状态从【启用自动删除】修改为【停用自动删除】 ";
+                    logContent3 = "状态从【启用自动删除】修改为【停用自动删除】";
                 }
             }
             String logContent = this.addListForLog(logContent1, logContent2, logContent3);
@@ -673,7 +673,7 @@ public class QywxOpenTaskController {
             }
         }
         if (CollectionUtils.isNotEmpty(list)) {
-            return list.stream().collect(Collectors.joining(","));
+            return list.stream().collect(Collectors.joining("，"));
         }
         return "";
     }

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -14,6 +14,7 @@
 	<dubbo:application name="haoban-manage3-web"/>
 
 	<dubbo:protocol name="dubbo" port="30009"/>
+	<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/>
 	<dubbo:reference interface="com.gic.member.tag.api.service.MemberTagGroupApiService" id="memberTagGroupApiService"/>
 	<dubbo:reference interface="com.gic.haoban.task.manage.api.service.OpenQwApiService" id="openQwApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.OpenStaffApiService" id="openStaffApiService"/>