diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index b7bd5847a..2f8f0063b 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -221,8 +221,8 @@ public class SysMenuController extends BaseController { // 2. 合同添加商铺+多经点位 addMenusForContract(); // 3. 账单 - // 1. 商户账单->账单催缴 - // 2. 商户账单 + addMenusForBills(); + return new ResultData(); @@ -311,6 +311,7 @@ public class SysMenuController extends BaseController { setAvailable("Y"); setResourceType(0); setIcon("icon-iconshangpuguanli"); + setVersionType(0); setSort(menuId_Shop.intValue()); }}); mallPermissionMapper.insertSelective(new MallPermission() {{ @@ -320,6 +321,7 @@ public class SysMenuController extends BaseController { setAvailable("Y"); setResourceType(0); setIcon("icon-shanghuguanli"); + setVersionType(0); setSort(menuId_Duojing.intValue()); }}); } catch (Exception e) { @@ -441,6 +443,143 @@ public class SysMenuController extends BaseController { }}); } + private void addMenusForBills() { + // 1. 账单列表隐藏 + mallPermissionService.saveOrUpdate(new MallPermission(){{ + setId(412L); + setAvailable("N"); + }}); + // 2. 新增新的账单列表folder + Long menuId_Zhangdanliebiao = 415L; + try { + mallPermissionMapper.insertSelective(new MallPermission() {{ + setId(menuId_Zhangdanliebiao); + setName("账单列表"); + setParentId(4L); + setAvailable("Y"); + setResourceType(0); + setIcon("icon-zhangdan5"); + setVersionType(0); + setSort(menuId_Zhangdanliebiao.intValue()); + }}); + } catch (Exception e) { + logger.error(e.getMessage()); + } + // 3. 迁移到账单列表下 + mallMenuMapper.updatePermissionByParentId(new MallPermission() {{ + List list = new ArrayList(); + list.add(402L); + list.add(403L); + list.add(404L); + list.add(405L); + list.add(406L); + list.add(407L); + list.add(408L); + setParentId(menuId_Zhangdanliebiao); + setIds(list); + }}); + // 4. 角色是否选中账单列表 + List mallRolePermissions = mallMenuMapper.getMallRolePermissions(new MallRolePermission(){{ + List list = new ArrayList(); + list.add(402L); + list.add(403L); + list.add(404L); + list.add(405L); + list.add(406L); + list.add(407L); + list.add(408L); + setPermissionIds(list); + }}); + for(MallRolePermission mallRolePermission: mallRolePermissions) { + List mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ + setTenantId(mallRolePermission.getTenantId()); + setRoleId(mallRolePermission.getRoleId()); + setPermissionId(menuId_Zhangdanliebiao); + }}); + if (mallRolePermissionList.size() <= 0) { + try { + mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ + setTenantId(mallRolePermission.getTenantId()); + setPermissionId(menuId_Zhangdanliebiao); + setRoleId(mallRolePermission.getRoleId()); + }}); + } catch (Exception e) { + logger.error(e.getMessage()); + } + } + } + // 5. 新增对账管理 + Long menuId_ZhangdanMan = 416L; + try { + mallPermissionMapper.insertSelective(new MallPermission() {{ + setId(menuId_ZhangdanMan); + setName("对账管理"); + setParentId(4L); + setAvailable("Y"); + setResourceType(0); + setIcon("icon-zhangdan11"); + setVersionType(0); + setSort(menuId_ZhangdanMan.intValue()); + }}); + } catch (Exception e) { + logger.error(e.getMessage()); + } + // 6. 迁移到对账管理下 + mallMenuMapper.updatePermissionByParentId(new MallPermission() {{ + List list = new ArrayList(); + list.add(409L); + list.add(410L); + list.add(411L); + setParentId(menuId_ZhangdanMan); + setIds(list); + }}); + // 7. 角色是否选中对账管理 + mallRolePermissions = mallMenuMapper.getMallRolePermissions(new MallRolePermission(){{ + List list = new ArrayList(); + list.add(409L); + list.add(410L); + list.add(411L); + setPermissionIds(list); + }}); + for(MallRolePermission mallRolePermission: mallRolePermissions) { + List mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ + setTenantId(mallRolePermission.getTenantId()); + setRoleId(mallRolePermission.getRoleId()); + setPermissionId(menuId_Zhangdanliebiao); + }}); + if (mallRolePermissionList.size() <= 0) { + try { + mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ + setTenantId(mallRolePermission.getTenantId()); + setPermissionId(menuId_Zhangdanliebiao); + setRoleId(mallRolePermission.getRoleId()); + }}); + } catch (Exception e) { + logger.error(e.getMessage()); + } + } + } + // 8. sale_type + mallMenuMapper.updateMallSaleType(new MallSaleType(){{ + setId(1L); + setMenus( + "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,952,961,962,965,966,967,968]" + ); + }}); + mallMenuMapper.updateMallSaleType(new MallSaleType(){{ + setId(2L); + setMenus( + "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,952,961,962,965,966,967,968]" + ); + }}); + mallMenuMapper.updateMallSaleType(new MallSaleType(){{ + setId(3L); + setMenus( + "[2,4,5,6,10,50,201,202,205,211,212,221,222,251,409,410,411,416,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,591,592,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932]" + ); + }}); + } + @Autowired private RequestMappingHandlerMapping requestMappingHandlerMapping;