Merge branch 'feature-recommend2' into developer

# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -24,7 +24,8 @@ import com.gic.enterprise.api.dto.custompage.CustomPageRenderDTO;
 import com.gic.enterprise.api.enums.CustomPageTypeEnum;
 import com.gic.enterprise.api.service.*;
 import com.gic.haoban.manage.web.qo.StaffAddVO;
-import com.gic.haoban.manage.web.utils.CustomSwitcher;
+import com.gic.haoban.manage.web.utils.switcher.CustomSwitcher;
+import com.gic.haoban.manage.web.utils.switcher.MarketingSwitcher;
 import com.gic.haoban.manage.web.utils.storestatusfilter.StoreStatusFilterUtils;
 import com.gic.haoban.manage.web.vo.*;
 import com.gic.marketing.pro.api.service.clerktask.ClerkTaskApiService;
@@ -69,6 +70,11 @@ import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
 import com.gic.haoban.manage.api.dto.role.StoreRoleDTO;
 import com.gic.haoban.manage.api.enums.*;
+import com.gic.haoban.manage.api.enums.AuditStatus;
+import com.gic.haoban.manage.api.enums.AuditType;
+import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
+import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
+import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum;
 import com.gic.haoban.manage.api.enums.role.RoleClerkTypeEnum;
 import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
@@ -333,6 +339,7 @@ public class WxStaffController extends WebBaseController {
 
         auditSettingVO.setShowAiCustom(this.aiCustom(storeDTO.getEnterpriseId()));
 
+        auditSettingVO.setPotentialHide(MarketingSwitcher.POTENTIAL_HIDE_STORE_ENTERPRSE_ID.contains(wxEnterpriseDTO.getEnterpriseId()) ? 1 : 0);
         return resultResponse(HaoBanErrCode.ERR_1, auditSettingVO);
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/SwitcherInitialization.java

 package com.gic.haoban.manage.web.utils;
 
 import com.gic.commons.switcher.SwitcherApplication;
+import com.gic.haoban.manage.web.utils.switcher.CustomSwitcher;
+import com.gic.haoban.manage.web.utils.switcher.MarketingSwitcher;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Component;
 
@@ -12,5 +14,6 @@ public class SwitcherInitialization implements InitializingBean {
     @Override
     public void afterPropertiesSet() throws Exception {
         SwitcherApplication.init(CustomSwitcher.class);
+        SwitcherApplication.init(MarketingSwitcher.class);
     }
 }
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/CustomSwitcher.java → haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/switcher/CustomSwitcher.java

-package com.gic.haoban.manage.web.utils;
+package com.gic.haoban.manage.web.utils.switcher;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.switcher.Switcher;

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/switcher/MarketingSwitcher.java

+package com.gic.haoban.manage.web.utils.switcher;
+
+import com.gic.commons.switcher.Switcher;
+import com.gic.commons.switcher.SwitcherNamespace;
+
+@SwitcherNamespace("BUZ.market-properties")
+public class MarketingSwitcher {
+
+    @Switcher
+    public static String POTENTIAL_HIDE_STORE_ENTERPRSE_ID;
+
+}
\ No newline at end of file

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

@@ -26,6 +26,8 @@ public class AuditSettingVO implements Serializable {
     private int showMemberSign ;
     // 是否显示ai换装
     private int showAiCustom ;
+    // 潜客雷达隐藏折扣店
+    private int potentialHide;
 
     private JSONObject shareMemberSignInfo ;
 
@@ -37,6 +39,14 @@ public class AuditSettingVO implements Serializable {
         this.showAiCustom = showAiCustom;
     }
 
+    public int getPotentialHide() {
+        return potentialHide;
+    }
+
+    public void setPotentialHide(int potentialHide) {
+        this.potentialHide = potentialHide;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public JSONObject getShareMemberSignInfo() {