Merge branch 'feature-recommend2' into 'master'

配置

See merge request !2925

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

@@ -288,14 +288,18 @@ public class WxStaffController extends WebBaseController {
      */
     @IgnoreLogin
     @RequestMapping("/get-audit-setting")
-    public HaobanResponse getAuditSetting(String wxEnterpriseId) {
+    public HaobanResponse getAuditSetting(String wxEnterpriseId,String enterpriseId) {
         if (StringUtils.isAnyBlank(wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         AuditSettingDTO auditSetting = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
 
         AuditSettingVO auditSettingVO = EntityUtil.changeEntityNew(AuditSettingVO.class, auditSetting);
-
+        int potentialHide = StringUtils.isNotBlank(MarketingSwitcher.POTENTIAL_HIDE_STORE_ENTERPRISE_ID)
+                && StringUtils.isNotBlank(enterpriseId)
+                && MarketingSwitcher.POTENTIAL_HIDE_STORE_ENTERPRISE_ID.contains(enterpriseId)
+                ? 1 : 0;
+        auditSettingVO.setPotentialHide(potentialHide);
         return resultResponse(HaoBanErrCode.ERR_1, auditSettingVO);
     }
 
@@ -308,7 +312,7 @@ public class WxStaffController extends WebBaseController {
      */
     @IgnoreLogin
     @RequestMapping("/get-user-setting")
-    public HaobanResponse getUserSetting(String wxEnterpriseId, String staffId,String enterpriseId) {
+    public HaobanResponse getUserSetting(String wxEnterpriseId, String staffId) {
         if (StringUtils.isAnyBlank(wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
@@ -354,11 +358,6 @@ public class WxStaffController extends WebBaseController {
 
         auditSettingVO.setShowAiCustom(this.aiCustom(storeDTO.getEnterpriseId()));
 
-        int potentialHide = StringUtils.isNotBlank(MarketingSwitcher.POTENTIAL_HIDE_STORE_ENTERPRISE_ID)
-                && StringUtils.isNotBlank(enterpriseId)
-                && MarketingSwitcher.POTENTIAL_HIDE_STORE_ENTERPRISE_ID.contains(enterpriseId)
-                ? 1 : 0;
-        auditSettingVO.setPotentialHide(potentialHide);
         return resultResponse(HaoBanErrCode.ERR_1, auditSettingVO);
     }