bugfix

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

@@ -147,7 +147,7 @@ public interface SystemMapper {
     /**
      * 根据路由名称查询菜单
      */
-    SysMenu getMenuByName(String name);
+    SysMenu getMenuByName(Integer menuType, String name);
     /**
      * 根据ID更新菜单
      */

src/main/java/com/caimei/service/auth/impl/ShopServiceImpl.java

@@ -46,7 +46,7 @@ public class ShopServiceImpl implements ShopService {
 
 
     @Value("${spring.profiles.active}")
-    private static String active;
+    private String active;
 
     @Override
     public ResponseJson<PageInfo<ShopListVo>> getShopList(Integer listType, String shopName, String loginAccount, Integer shopType, Integer brandId, String mobile, String linkMan, Integer lowerAuditStatus, Integer pageNum, Integer pageSize) {

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

@@ -112,6 +112,10 @@ public class SysMenuServiceImpl implements SysMenuService {
     public ResponseJson<Void> updateMenu(Integer id, SysMenu menu) {
         menu.setId(id);
         menu.setDelFlag(0);
+        SysMenu dbMenu = systemMapper.getMenuByName(menu.getMenuType(), menu.getName());
+        if (null != dbMenu && !dbMenu.getId().equals(id)) {
+            return ResponseJson.error("菜单路由名已存在", null);
+        }
         systemMapper.updateMenu(menu);
         // 按钮权限JSON数据解析
         ResponseJson<List<SysPermission>> result = parsePermissionJson(menu.getId(), menu.getPermissionJson());
@@ -190,8 +194,12 @@ public class SysMenuServiceImpl implements SysMenuService {
         if (!StringUtils.hasLength(menu.getTitle())) {
             return ResponseJson.error("菜单名称不能为空！", null);
         }
+        log.info(menu.getMenuType() + "," + menu.getName());
         // 根据路由名称查询菜单
-        SysMenu dbMenu = systemMapper.getMenuByName(menu.getName());
+        SysMenu dbMenu = systemMapper.getMenuByName(menu.getMenuType(), menu.getName());
+        if (null != dbMenu) {
+            log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + dbMenu.getId());
+        }
         if (null == dbMenu) {
             systemMapper.insertMenu(menu);
             // 按钮权限JSON数据解析
@@ -319,6 +327,9 @@ public class SysMenuServiceImpl implements SysMenuService {
         for (Integer permissionId : permissionIds) {
            systemMapper.deletePermission(permissionId);
         }
+        // 获取子菜单列表,递归删除
+        List<SysMenu> childMenuList = systemMapper.getMenuList(id, null, null);
+        childMenuList.forEach(childMenu-> deleteMenu(childMenu.getId()));
         return ResponseJson.success();
     }
 

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

@@ -60,6 +60,7 @@ public class VipServiceImpl implements VipService {
             if (dbAuthVip.getEndTime().compareTo(beginTime) > 0) {
                 // 有效期内续费,用原结束时间作为开始时间来计算结束时间
                 beginTime = dbAuthVip.getEndTime();
+                authVip.setBeginTime(dbAuthVip.getBeginTime());
             } else {
                 // 过期重新续费，重置生效时间
                 authVip.setBeginTime(beginTime);

src/main/resources/mapper/SystemMapper.xml

@@ -177,7 +177,7 @@
                m.create_time AS createTime,
                del_flag      AS delFlag
         FROM auth_menu m
-        WHERE m.name = #{name}
+        WHERE m.name = #{name} and m.menu_type = #{menuType}
     </select>
     <update id="updateMenu">
         UPDATE auth_menu