bugfix-删除菜单

src/main/java/com/caimei/controller/wechat/WxAuthApi.java

@@ -43,7 +43,7 @@ public class WxAuthApi {
     @ApiOperation("已认证机构列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "appId", required = true, value = "供应商公众号appId"),
-            @ApiImplicitParam(name = "lngAndLat", required = true, value = "用户当前经纬度"),
+            @ApiImplicitParam(name = "lngAndLat", required = false, value = "用户当前经纬度"),
             @ApiImplicitParam(name = "clubName", required = false, value = "机构名称"),
             @ApiImplicitParam(name = "provinceId", required = false, value = "省id"),
             @ApiImplicitParam(name = "cityId", required = false, value = "市id"),

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

@@ -29,7 +29,7 @@ public interface ClubMapper {
 
     Integer getStatusByClubUserId(Integer clubUserId);
 
-    List<WxClubListVo> getWxClubList(@Param("appId") String appId, @Param("clubName") String clubName, @Param("provinceId") Integer provinceId, @Param("cityId") Integer cityId, @Param("townId") Integer townId, @Param("lng") BigDecimal lng, @Param("lat") BigDecimal lat);
+    List<WxClubListVo> getWxClubList(@Param("appId") String appId, @Param("clubName") String clubName, @Param("provinceId") Integer provinceId, @Param("cityId") Integer cityId, @Param("townId") Integer townId, @Param("lng") Double lng, @Param("lat") Double lat);
 
     Integer checkMobile(@Param("mobile") String mobile, @Param("appId") String appId);
 

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

@@ -117,14 +117,14 @@ public class AuthClubServiceImpl implements AuthClubService {
         if (null == appId) {
             return ResponseJson.error("参数异常，请输入供应商公众号appId", null);
         }
-        if (StringUtils.isEmpty(lngAndLat)) {
-            return ResponseJson.error("参数异常，请输入用户当前经纬度", null);
-        }
         log.info("查询机构数据，经纬度：" + lngAndLat);
-        String[] split = lngAndLat.split(",");
-        BigDecimal lng = new BigDecimal(split[0]);
-        BigDecimal lat = new BigDecimal(split[1]);
-        PageHelper.startPage(pageNum, pageSize);
+        Double lng = null;
+        Double lat = null;
+        if (StringUtils.isNotEmpty(lngAndLat)) {
+            String[] split = lngAndLat.split(",");
+            lng = Double.parseDouble(split[0]);
+            lat = Double.parseDouble(split[1]);
+        }
         List<WxClubListVo> clubList = clubMapper.getWxClubList(appId, clubName, provinceId, cityId, townId, lng, lat);
         PageInfo<WxClubListVo> pageData = new PageInfo<>(clubList);
         return ResponseJson.success(pageData);

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

@@ -337,18 +337,20 @@ public class SysMenuServiceImpl implements SysMenuService {
     @Transactional(rollbackFor=Exception.class)
     @Override
     public ResponseJson<Void> deleteMenu(Integer id) {
-        systemMapper.deleteMenu(id);
         // 删除该菜单对应的会员角色和关联
         Integer vipRoleId = systemMapper.getVipRoleIdByMenuId(id);
-        if (null != vipRoleId) {
+        SysMenu menu = systemMapper.getMenu(id);
+        systemMapper.deleteMenuRoleRelation(id);
+        if (0 == menu.getParentId()) {
             systemMapper.deleteRole(vipRoleId);
-            systemMapper.deleteRoleMenuRelation(vipRoleId);
         }
         List<Integer> permissionIds = systemMapper.getPermissionIds(id);
         // 删除该菜单权限按钮
         for (Integer permissionId : permissionIds) {
            systemMapper.deletePermission(permissionId);
         }
+        // 删除菜单
+        systemMapper.deleteMenu(id);
         // 获取子菜单列表,递归删除
         List<SysMenu> childMenuList = systemMapper.getMenuList(id, null, null);
         childMenuList.forEach(childMenu-> deleteMenu(childMenu.getId()));