首页菜单119版本IOS不显示发票以及线上店铺

This commit is contained in:
liuyingfang
2024-03-19 11:24:30 +08:00
parent 9c2ef00db1
commit 378fcd50df
2 changed files with 20 additions and 2 deletions

View File

@@ -21,4 +21,12 @@ public class HttpUtils {
*/ */
return userAgent.contains("iOS"); return userAgent.contains("iOS");
} }
public static boolean phoneType(HttpServletRequest request){
String userAgent = request.getHeader("type");
if ("1".equals(userAgent)){
return false;
}
return true;
}
} }

View File

@@ -49,8 +49,8 @@ public class AppMenuServiceImpl extends ServiceImpl<AppMenuMapper, AppMenu> impl
@Override @Override
public List<Map<String, Object>> getHomeMenu(HttpServletRequest request) { public List<Map<String, Object>> getHomeMenu(HttpServletRequest request) {
// 1、安卓; 2、iOS // 1、安卓; 2、iOS
int clientType = HttpUtils.isIOS(request)? 2: 1; //int clientType = HttpUtils.isIOS(request)? 2: 1;
int clientType = HttpUtils.phoneType(request)?2:1;
final String demoFlag = request.getHeader("demo"); final String demoFlag = request.getHeader("demo");
List<Map<String, Object>> result = new ArrayList<>(); List<Map<String, Object>> result = new ArrayList<>();
@@ -66,8 +66,18 @@ public class AppMenuServiceImpl extends ServiceImpl<AppMenuMapper, AppMenu> impl
appMenuList = baseMapper.getByNavCode(dict.getId(),userType, clientType); appMenuList = baseMapper.getByNavCode(dict.getId(),userType, clientType);
} }
//根据版本号
String version = request.getHeader("version");
Map<String, Object> map = null; Map<String, Object> map = null;
for (AppMenu appMenu : appMenuList) { for (AppMenu appMenu : appMenuList) {
if (StringUtils.isNotBlank(version)){
if ("119".equals(version) && clientType==2){
if (appMenu.getId()==62 || appMenu.getId()==18){
break;
}
}
}
AppMenu.wrapper(appMenu); AppMenu.wrapper(appMenu);
menuPathConvert(appMenu, request); menuPathConvert(appMenu, request);
if (map == null || !map.get("type").equals(appMenu.getMenuGroupDesc())) { if (map == null || !map.get("type").equals(appMenu.getMenuGroupDesc())) {