bugfix-支付/菜单

src/main/java/com/caimei/controller/pay/PayApi.java

@@ -127,6 +127,24 @@ public class PayApi {
         return getResponseJson(result);
     }
 
+    @ApiOperation("生成网银支付链接")
+    @ApiImplicitParam(required = false, name = "param", value = "参数")
+    @PostMapping("/link")
+    public ResponseJson<String> getPayLink(@RequestBody Map<String,Object> param) throws Exception {
+        String url = core + "/order/pay/link";
+        String result = RequestUtil.sendPost(url, param);
+        return getResponseJson(result);
+    }
+
+    @ApiOperation("重定向页面的支付数据")
+    @ApiImplicitParam(required = false, name = "linkLogo", value = "参数")
+    @GetMapping("/link/data")
+    public ResponseJson<String> getPayLinkData(String linkLogo) throws Exception {
+        String url = core + "/order/pay/link/data?linkLogo=" + linkLogo;
+        String result = RequestUtil.sendGet(url);
+        return getResponseJson(result);
+    }
+
     private ResponseJson<String> getResponseJson(String parameters) {
         JSONObject object = JSONObject.parseObject(parameters);
         Integer code = object.getInteger("code");

src/main/java/com/caimei/controller/sys/SysMenuApi.java

@@ -43,8 +43,8 @@ public class SysMenuApi {
      * 获取所有启用的菜单列表（树状结构返回）
      */
     @GetMapping("/tree")
-    public ResponseJson<List<SysMenuTree>> menuTree() {
-        return sysMenuService.getMenuTree();
+    public ResponseJson<List<SysMenuTree>> menuTree(Integer menuType) {
+        return sysMenuService.getMenuTree(menuType);
     }
 
     /**

src/main/java/com/caimei/mapper/SystemMapper.java

@@ -134,7 +134,7 @@ public interface SystemMapper {
      * 获取树状菜单列表
      * @param parentId 父级菜单Id
      */
-    List<SysMenuTree> getMenuTree(String parentId);
+    List<SysMenuTree> getMenuTree(String parentId, Integer menuType);
     /**
      * 获取当前菜单的按钮权限
      * @param menuId 菜单Id

src/main/java/com/caimei/service/sys/SysMenuService.java

@@ -28,7 +28,7 @@ public interface SysMenuService {
     /**
      * 获取所有启用的菜单列表（树状结构返回）
      */
-    ResponseJson<List<SysMenuTree>> getMenuTree();
+    ResponseJson<List<SysMenuTree>> getMenuTree(Integer menuType);
     /**
      * 根据ID获取菜单
      */

src/main/java/com/caimei/service/sys/impl/SysMenuServiceImpl.java

@@ -61,8 +61,9 @@ public class SysMenuServiceImpl implements SysMenuService {
      * 获取所有启用的菜单列表（树状结构返回）
      */
     @Override
-    public ResponseJson<List<SysMenuTree>> getMenuTree() {
-        List<SysMenuTree> menus = systemMapper.getMenuTree("0");
+    public ResponseJson<List<SysMenuTree>> getMenuTree(Integer menuType) {
+        menuType = null == menuType ? 1 : menuType;
+        List<SysMenuTree> menus = systemMapper.getMenuTree("0", menuType);
         // 递归设置子菜单
         setSubMenusData(menus);
         return ResponseJson.success(menus);
@@ -75,7 +76,7 @@ public class SysMenuServiceImpl implements SysMenuService {
         if (!CollectionUtils.isEmpty(menus)) {
             for (SysMenuTree menu : menus) {
                 // 获取子菜单
-                List<SysMenuTree> submenus = systemMapper.getMenuTree(menu.getId());
+                List<SysMenuTree> submenus = systemMapper.getMenuTree(menu.getId(), null);
                 if (!CollectionUtils.isEmpty(submenus)) {
                     setSubMenusData(submenus);
                     menu.setSubMenus(submenus);
@@ -131,7 +132,7 @@ public class SysMenuServiceImpl implements SysMenuService {
             removeMenuRoleRelation(menu, dbMenu);
             if (1 == baseParentMenu.getBaseFlag()) {
                 // 供应商基础菜单
-                addShopRoleRelation(menu.getId(), permissionList);
+                addShopRoleRelation(menu, permissionList);
             } else {
                 // 供应商会员菜单
                 ResponseJson<Void> saveResult = saveVipMenu(menu, permissionList);
@@ -216,7 +217,7 @@ public class SysMenuServiceImpl implements SysMenuService {
                 menu.setBaseParentId(baseParentId);
                 if (1 == baseParentMenu.getBaseFlag()) {
                     // 会员基础菜单
-                    addShopRoleRelation(menuId, permissionList);
+                    addShopRoleRelation(menu, permissionList);
                 } else {
                     // 会员订制菜单
                     ResponseJson<Void> saveResult = saveVipMenu(menu, permissionList);
@@ -251,7 +252,7 @@ public class SysMenuServiceImpl implements SysMenuService {
     @Override
     public ResponseJson<Void> saveVipMenu(SysMenu menu, List<SysPermission> permissionList) {
         if (0 == menu.getParentId()) {
-            // 供应商订制首层菜单
+            // 供应商订制顶层菜单
             // 保存会员菜单角色
             SysRole vipMenuRole = new SysRole();
             vipMenuRole.setRoleName(menu.getTitle() + "会员菜单角色");
@@ -259,11 +260,14 @@ public class SysMenuServiceImpl implements SysMenuService {
             vipMenuRole.setMenuIds(menu.getId().toString());
             vipMenuRole.setRoleType(2);
             Integer dbVipRoleId = systemMapper.getVipRoleIdByMenuId(menu.getId());
+            vipMenuRole.setId(dbVipRoleId);
+            vipMenuRole.setDelFlag(0);
             ResponseJson<Void> result = null;
             if (null == dbVipRoleId) {
                 result = sysRoleService.addRole(vipMenuRole);
             } else {
-                result = sysRoleService.updateRole(dbVipRoleId, vipMenuRole);
+                systemMapper.updateRole(vipMenuRole);
+                result = ResponseJson.success();
             }
             if (0 != result.getCode()) {
                 return result;
@@ -281,7 +285,8 @@ public class SysMenuServiceImpl implements SysMenuService {
         return ResponseJson.success();
     }
 
-    private void addShopRoleRelation(Integer menuId, List<SysPermission> permissionList) {
+    private void addShopRoleRelation(SysMenu menu, List<SysPermission> permissionList) {
+        Integer menuId = menu.getId();
         // 添加供应商基础菜单时将该菜单与供应商基础角色关联
         // 根据角色ID获取菜单Ids
         List<Integer> menuIdList = systemMapper.getMenuIdsByRoleId(1);
@@ -291,12 +296,10 @@ public class SysMenuServiceImpl implements SysMenuService {
             String menuIds = CommonUtil.idListToString(menuIdList, ",");
             sysRole.setMenuIds(menuIds);
             sysRoleService.updateRole(1, sysRole);
-            sysRoleService.updateRole(2, sysRole);
         }
         // 添加权限关联
         permissionList.forEach(permission->{
             systemMapper.insertRolePermissionRelation(1,permission.getId());
-            systemMapper.insertRolePermissionRelation(2,permission.getId());
         });
     }
 
@@ -312,7 +315,6 @@ public class SysMenuServiceImpl implements SysMenuService {
             SysRole sysRole = new SysRole();
             sysRole.setMenuIds(menuIds);
             sysRoleService.updateRole(1, sysRole);
-            sysRoleService.updateRole(2, sysRole);
         } else {
             // 之前是订制菜单
             Integer roleId = systemMapper.getVipRoleIdByMenuId(menuId);
@@ -320,7 +322,8 @@ public class SysMenuServiceImpl implements SysMenuService {
                 // 只有顶层订制菜单更改为基础菜单才删除原角色
                 systemMapper.deleteRole(roleId);
                 systemMapper.deleteMenuRoleRelation(menuId);
-            } else {
+            } else if (0 != menu.getParentId()) {
+                // 子菜单删除菜单角色关联
                 systemMapper.deleteMenuRoleRelation(menuId);
             }
         }

src/main/java/com/caimei/service/vip/impl/VipServiceImpl.java

@@ -238,12 +238,10 @@ public class VipServiceImpl implements VipService {
         baseMenuIdSet.forEach(menuId -> {
             // 保存角色菜单关系
             systemMapper.insertRoleMenuRelation(1, menuId);
-            systemMapper.insertRoleMenuRelation(2, menuId);
         });
         basePermissionIdSet.forEach(permissionId->{
             // 保存角色权限关系
             systemMapper.insertRolePermissionRelation(1, permissionId);
-            systemMapper.insertRolePermissionRelation(2, permissionId);
         });
         upMenuList.forEach(menu->{
             Set<Integer> vipMenuIdSet = new HashSet<>();

src/main/resources/mapper/SystemMapper.xml

@@ -146,10 +146,13 @@
     <select id="getMenuTree" resultType="com.caimei.model.po.SysMenuTree">
         SELECT m.id, m.name, m.title, m.parent_id AS parentId
         FROM auth_menu m
-        WHERE m.del_flag = 0 and menu_type = 1
+        WHERE m.del_flag = 0
         <if test="parentId != null or parentId == 0">
             AND m.parent_id = #{parentId}
         </if>
+        <if test="menuType != null">
+            and m.menu_type = #{menuType}
+        </if>
         ORDER BY m.sort
     </select>
     <select id="getTreePermissions" resultType="com.caimei.model.po.SysMenuTree">
@@ -177,7 +180,8 @@
                m.create_time AS createTime,
                del_flag      AS delFlag
         FROM auth_menu m
-        WHERE m.name = #{name} and m.menu_type = #{menuType}
+        WHERE m.name = #{name}
+          and m.menu_type = #{menuType}
     </select>
     <update id="updateMenu">
         UPDATE auth_menu
@@ -221,6 +225,7 @@
         where menu_id = #{menuId}
           and role_id not in (1, 2)
           and role_type = 2
+          and r.id is not null
         limit 1
     </select>
     <select id="getUserList" resultType="com.caimei.model.po.SysUser">
@@ -235,7 +240,13 @@
         </if>
     </select>
     <select id="getVipMenuList" resultType="com.caimei.model.po.SysMenu">
-        select m.title,arm.role_id as roleId from auth_menu m left join auth_role_menu arm on m.id = arm.menu_id where menu_type = 2 and base_flag = 0 and status = 0
+        select m.title, arm.role_id as roleId
+        from auth_menu m
+                 left join auth_role_menu arm on m.id = arm.menu_id
+        where menu_type = 2
+          and base_flag = 0
+          and status = 0
+          and m.parent_id = 0
     </select>
     <select id="getVipRoleIdList" resultType="java.lang.Integer">
         select role_id from auth_role_user where user_id = #{authUserId}