feat:权限修改

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java

@@ -237,13 +237,4 @@ public interface WxEnterpriseApiService {
     
     public String getEndDate(String enterpriseId) ;
 
-    /**
-     * 默认生成好办小程序权限
-     *
-     * @param wxEnterpriseId wx企业标识
-     * @author mozhu
-     * @date 2022-09-14 11:07:24
-     */
-    void addHaobanRole(String wxEnterpriseId);
-
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanRoleApiService.java

@@ -41,10 +41,19 @@ public interface HaobanRoleApiService {
      */
     ServiceResponse<HaobanRoleDTO> getMenuByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType,Integer systemFlag);
 
-
     /**
-     * 添加haoban角色初始化
      *
+     * 默认生成好办小程序权限
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link ServiceResponse}
+     * @author mozhu
+     * @date 2022-09-14 11:07:24
+     */
+    ServiceResponse addHaobanRole(String wxEnterpriseId);
+
+    /**
+     * 角色初始化
      * @param wxEnterpriseId wx企业标识
      * @return {@link ServiceResponse}
      */

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java

@@ -7,9 +7,11 @@ import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.enums.QuartzEnum;
 import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum;
-import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
+import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.TestApiService;
 import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
-import com.gic.haoban.manage.api.service.role.HaobanMenuApiService;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
 import com.gic.haoban.manage.web.controller.WebBaseController;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@@ -60,10 +62,6 @@ public class TestController extends WebBaseController {
     private ExternalClerkRelatedApiService externalClerkRelatedApiService;
     @Autowired
     private HaobanRoleApiService haobanRoleApiService;
-    @Autowired
-    private HaobanMenuApiService haobanMenuApiService;
-    @Autowired
-    private WxEnterpriseApiService wxEnterpriseApiService;
 
     /**
      * 创建定时器
@@ -245,7 +243,14 @@ public class TestController extends WebBaseController {
 
     @RequestMapping("/addHaobanRoleByWxEnterpriseId")
     public HaobanResponse addHaobanRoleByWxEnterpriseId(String wxEnterpriseId) {
-        wxEnterpriseApiService.addHaobanRole(wxEnterpriseId);
+        haobanRoleApiService.addHaobanRole(wxEnterpriseId);
+        return resultResponse(HaoBanErrCode.ERR_1);
+    }
+
+
+    @RequestMapping("/addHaobanRoleInit")
+    public HaobanResponse addHaobanRoleInit(String wxEnterpriseId) {
+        haobanRoleApiService.addHaobanRoleInit(wxEnterpriseId);
         return resultResponse(HaoBanErrCode.ERR_1);
     }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java

@@ -8,13 +8,9 @@ import com.gic.enterprise.api.constant.EnterpriseServiceEnum;
 import com.gic.enterprise.api.dto.EnterpriseUsingPermissionDto;
 import com.gic.enterprise.api.service.EnterpriseUseForbidService;
 import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.*;
-import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO;
-import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.enums.role.RoleClerkTypeEnum;
 import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
@@ -24,10 +20,7 @@ import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
 import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.pojo.bo.StaffPrivacyUseLogBO;
-import com.gic.haoban.manage.service.pojo.bo.role.HaobanRoleBO;
 import com.gic.haoban.manage.service.service.*;
-import com.gic.haoban.manage.service.service.role.HaobanRoleMenuService;
-import com.gic.haoban.manage.service.service.role.HaobanRoleService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -69,10 +62,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     @Autowired
     private HaobanCommonMQApiService haobanCommonMQApiService ;
     @Autowired
-    private HaobanRoleMenuService haobanRoleMenuService;
-    @Autowired
-    private HaobanRoleService haobanRoleService;
-    @Autowired
     private HaobanRoleApiService haobanRoleApiService;
 
 
@@ -124,7 +113,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
             wxEnterpriseId = wxEnterpriseService.add(wxDTO);
             //好办小程序插入权限
             log.info("插入好办小程序权限：{}",wxEnterpriseId);
-            addHaobanRole(wxEnterpriseId);
+            haobanRoleApiService.addHaobanRole(wxEnterpriseId);
         }
         TabHaobanWxApplication haobanWxApplication = wxApplicationService.selectBySiteIdAndWxEnterpriseId(siteId, wxEnterpriseId);
         if (haobanWxApplication == null) {
@@ -521,56 +510,4 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         }
         return "好办服务已到期" ;
     }
-
-    @Override
-    public void addHaobanRole(String wxEnterpriseId) {
-        List<HaobanRoleBO> haobanRoleBOList = haobanRoleService.getListByWxEnterpriseId("-1",null);
-        HaobanRoleQDTO haobanRoleQDTO = new HaobanRoleQDTO();
-
-        HaobanRoleQDTO haobanRoleSystemQDTO = new HaobanRoleQDTO();
-
-        for (HaobanRoleBO haobanRoleBO : haobanRoleBOList) {
-            Long roleId = haobanRoleBO.getRoleId();
-            Integer clerkType = haobanRoleBO.getClerkType();
-            String roleName = haobanRoleBO.getRoleName();
-            int count = haobanRoleService.getCountByWxEnterpriseId(wxEnterpriseId,null);
-            //清除历史权限
-            if (count > 0) {
-                haobanRoleService.deleteByWxEnterpriseId(wxEnterpriseId,null);
-                haobanRoleMenuService.deleteByWxEnterpriseId(wxEnterpriseId);
-            }
-            haobanRoleQDTO.setRoleName(roleName);
-            haobanRoleSystemQDTO.setRoleName(roleName);
-
-            List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId("-1", roleId);
-
-            if (RoleClerkTypeEnum.CLERK.getCode().equals(clerkType)) {
-                HaobanRoleMenuQDTO clerkMenus = new HaobanRoleMenuQDTO();
-                clerkMenus.setClerkType(clerkType);
-                clerkMenus.setMenuCodes(menuCodes);
-                haobanRoleQDTO.setClerkMenus(clerkMenus);
-                haobanRoleSystemQDTO.setClerkMenus(clerkMenus);
-            } else if (RoleClerkTypeEnum.SHOP.getCode().equals(clerkType)) {
-                HaobanRoleMenuQDTO manegeClerkMenus = new HaobanRoleMenuQDTO();
-                manegeClerkMenus.setClerkType(clerkType);
-                manegeClerkMenus.setMenuCodes(menuCodes);
-                haobanRoleQDTO.setManegeClerkMenus(manegeClerkMenus);
-                haobanRoleSystemQDTO.setManegeClerkMenus(manegeClerkMenus);
-            }else if (RoleClerkTypeEnum.MANAGE.getCode().equals(clerkType)) {
-                HaobanRoleMenuQDTO managerMenus = new HaobanRoleMenuQDTO();
-                managerMenus.setClerkType(clerkType);
-                managerMenus.setMenuCodes(menuCodes);
-                haobanRoleQDTO.setManagerMenus(managerMenus);
-                haobanRoleSystemQDTO.setManagerMenus(managerMenus);
-            }
-        }
-        WebLoginDTO login = new WebLoginDTO();
-        login.setWxEnterpriseId(wxEnterpriseId);
-        login.setClerkId("-1");
-        login.setClerkName("系统");
-        //商户权限
-        haobanRoleApiService.add(haobanRoleQDTO, login);
-        //运维系统权限
-        haobanRoleApiService.add(haobanRoleSystemQDTO, login);
-    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

@@ -189,6 +189,59 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
     }
 
     @Override
+    public ServiceResponse addHaobanRole(String wxEnterpriseId) {
+        List<HaobanRoleBO> haobanRoleBOList = haobanRoleService.getListByWxEnterpriseId("-1",null);
+        HaobanRoleQDTO haobanRoleQDTO = new HaobanRoleQDTO();
+
+        HaobanRoleQDTO haobanRoleSystemQDTO = new HaobanRoleQDTO();
+
+        for (HaobanRoleBO haobanRoleBO : haobanRoleBOList) {
+            Long roleId = haobanRoleBO.getRoleId();
+            Integer clerkType = haobanRoleBO.getClerkType();
+            String roleName = haobanRoleBO.getRoleName();
+            int count = haobanRoleService.getCountByWxEnterpriseId(wxEnterpriseId,null);
+            //清除历史权限
+            if (count > 0) {
+                haobanRoleService.deleteByWxEnterpriseId(wxEnterpriseId,null);
+                haobanRoleMenuService.deleteByWxEnterpriseId(wxEnterpriseId);
+            }
+            haobanRoleQDTO.setRoleName(roleName);
+            haobanRoleSystemQDTO.setRoleName(roleName);
+
+            List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId("-1", roleId);
+
+            if (RoleClerkTypeEnum.CLERK.getCode().equals(clerkType)) {
+                HaobanRoleMenuQDTO clerkMenus = new HaobanRoleMenuQDTO();
+                clerkMenus.setClerkType(clerkType);
+                clerkMenus.setMenuCodes(menuCodes);
+                haobanRoleQDTO.setClerkMenus(clerkMenus);
+                haobanRoleSystemQDTO.setClerkMenus(clerkMenus);
+            } else if (RoleClerkTypeEnum.SHOP.getCode().equals(clerkType)) {
+                HaobanRoleMenuQDTO manegeClerkMenus = new HaobanRoleMenuQDTO();
+                manegeClerkMenus.setClerkType(clerkType);
+                manegeClerkMenus.setMenuCodes(menuCodes);
+                haobanRoleQDTO.setManegeClerkMenus(manegeClerkMenus);
+                haobanRoleSystemQDTO.setManegeClerkMenus(manegeClerkMenus);
+            }else if (RoleClerkTypeEnum.MANAGE.getCode().equals(clerkType)) {
+                HaobanRoleMenuQDTO managerMenus = new HaobanRoleMenuQDTO();
+                managerMenus.setClerkType(clerkType);
+                managerMenus.setMenuCodes(menuCodes);
+                haobanRoleQDTO.setManagerMenus(managerMenus);
+                haobanRoleSystemQDTO.setManagerMenus(managerMenus);
+            }
+        }
+        WebLoginDTO login = new WebLoginDTO();
+        login.setWxEnterpriseId(wxEnterpriseId);
+        login.setClerkId("-1");
+        login.setClerkName("系统");
+        //商户权限
+        add(haobanRoleQDTO, login);
+        //运维系统权限
+        add(haobanRoleSystemQDTO, login);
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse addHaobanRoleInit(String wxEnterpriseId) {
         List<TabHaobanWxEnterpriseRelated> enterpriseRelateds = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);
         //全品牌搜索
@@ -212,9 +265,13 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         }
 
         List<HaobanRoleBO> haobanRoleBOList = haobanRoleService.getListByWxEnterpriseId("-1",null);
+        //导购店长
         List<String> menuCodes = new ArrayList<>();
+        //区经
+        List<String> menuManageCodes = new ArrayList<>();
         if (searchFlag) {
             menuCodes.add("customerList_allSearch");
+            menuManageCodes.add("customerList_allSearch");
         }
         if (handoverFlag) {
             menuCodes.add("customerList_inheritCustomer");
@@ -251,12 +308,12 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
                 haobanRoleQDTO.setManegeClerkMenus(manegeClerkMenus);
                 haobanRoleSystemQDTO.setManegeClerkMenus(manegeClerkMenus);
             }else if (RoleClerkTypeEnum.MANAGE.getCode().equals(clerkType)) {
-                List<String> menuManageCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId("-1", roleId);
-                menuCodes.addAll(menuManageCodes);
+                List<String> manageCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId("-1", roleId);
+                menuManageCodes.addAll(manageCodes);
 
                 HaobanRoleMenuQDTO managerMenus = new HaobanRoleMenuQDTO();
                 managerMenus.setClerkType(clerkType);
-                managerMenus.setMenuCodes(menuCodes);
+                managerMenus.setMenuCodes(menuManageCodes);
                 haobanRoleQDTO.setManagerMenus(managerMenus);
                 haobanRoleSystemQDTO.setManagerMenus(managerMenus);
             }

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -198,6 +198,7 @@
     <dubbo:reference interface="com.gic.thirdparty.api.service.CommunicationService" id="communicationService" timeout="10000" retries="0"/>
 
     <dubbo:reference interface="com.gic.member.api.service.MemberEntranceApiService" id="memberEntranceApiService" timeout="10000" retries="0"/>
+    <dubbo:reference interface="com.gic.haoban.app.customer.service.api.service.ManageSettingApiService" id="manageSettingApiService" timeout="10000" retries="0"/>
 
 
 </beans>
\ No newline at end of file