Merge branch 'feature-recommend2'

# 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

@@ -295,11 +295,6 @@ public class WxStaffController extends WebBaseController {
         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);
     }
 
@@ -1563,7 +1558,7 @@ public class WxStaffController extends WebBaseController {
      * @return
      */
     @RequestMapping(value = "/queryMenuCodesByClerkType", method = RequestMethod.GET)
-    public RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType, String staffId, String wxEnterpriseId , String enterpriseId) {
+    public RestResponse<HaobanRoleVO> queryMenuByClerkType(Integer clerkType, String staffId, String wxEnterpriseId , String enterpriseId) {
         if(StringUtils.isBlank(wxEnterpriseId) || wxEnterpriseId.equals("-1")) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()), HaoBanErrCode.ERR_2.getMsg());
         }
@@ -1575,18 +1570,31 @@ public class WxStaffController extends WebBaseController {
             // 游客获取系统级别的导购权限
             ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService
                     .getMenuByWxEnterpriseIdAndClerkType("-1", RoleClerkTypeEnum.CLERK.getCode(), 0);
-            return RestResponse.successResult(serviceResponse.getResult());
+            return RestResponse.successResult(convertHaobanRoleVO(serviceResponse.getResult(),enterpriseId));
         }
         if (StringUtils.isBlank(staffId) || "-1".equals(staffId)) {
             logger.info("未登录游客获取系统级别的导购权限");
             // 游客获取系统级别的导购权限
             ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService
                     .getMenuByWxEnterpriseIdAndClerkType("-1", RoleClerkTypeEnum.CLERK.getCode(), 0);
-            return RestResponse.successResult(serviceResponse.getResult());
+            return RestResponse.successResult(convertHaobanRoleVO(serviceResponse.getResult(),enterpriseId));
         }
         ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService
                 .getMenuByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, 1 , enterpriseId);
-        return RestResponse.successResult(serviceResponse.getResult());
+        return RestResponse.successResult(convertHaobanRoleVO(serviceResponse.getResult(),enterpriseId));
+    }
+
+    private HaobanRoleVO convertHaobanRoleVO(HaobanRoleDTO haobanRoleDTO,String enterpriseId) {
+        if (haobanRoleDTO == null) {
+            return null;
+        }
+        HaobanRoleVO haobanRoleVO = EntityUtil.changeEntityNew(HaobanRoleVO.class, haobanRoleDTO);
+        int potentialHide = StringUtils.isNotBlank(MarketingSwitcher.POTENTIAL_HIDE_STORE_ENTERPRISE_ID)
+                && StringUtils.isNotBlank(enterpriseId)
+                && MarketingSwitcher.POTENTIAL_HIDE_STORE_ENTERPRISE_ID.contains(enterpriseId)
+                ? 1 : 0;
+        haobanRoleVO.setPotentialHide(potentialHide);
+        return haobanRoleVO;
     }
 
     /**

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

@@ -26,8 +26,6 @@ public class AuditSettingVO implements Serializable {
     private int showMemberSign ;
     // 是否显示ai换装
     private int showAiCustom ;
-    // 潜客雷达隐藏折扣店
-    private int potentialHide;
 
     private JSONObject shareMemberSignInfo ;
 
@@ -39,14 +37,6 @@ 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() {

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

+package com.gic.haoban.manage.web.vo;
+
+import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
+
+public class HaobanRoleVO extends HaobanRoleDTO {
+
+    // 潜客雷达隐藏折扣店
+    private int potentialHide;
+
+    public int getPotentialHide() {
+        return potentialHide;
+    }
+
+    public void setPotentialHide(int potentialHide) {
+        this.potentialHide = potentialHide;
+    }
+}