From 482f58537fa3f0cab93b88c6d0bcb803e0431cfc Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Wed, 23 Sep 2020 15:51:08 +0800 Subject: [PATCH] 1.增加后台开通医院/科室的单次支付功能,并自动充入指定套餐 2.新增查询医院科室是否开通单次支付功能的接口 3.新增查询医院科室的支付单价 4.修改扣费业务4个接口,增加支持单次支付的判断与处理 5.增加接口,查看某个诊断的支付状态 --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java index 600bd93..fb113aa 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java @@ -15,7 +15,6 @@ import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -41,7 +40,7 @@ @Autowired private ISysMenuService menuService; - /** + /**current * 两层循环实现建树 * * @param sysMenus @@ -129,7 +128,7 @@ @ApiOperation(value = "根据roleCodes获取对应的权限") @SuppressWarnings("unchecked") - @Cacheable(value = "menu", key ="#roleCodes") +// @Cacheable(value = "menu", key ="#roleCodes") @GetMapping("/{roleCodes}") public List<SysMenu> findMenuByRoles(@PathVariable String roleCodes) { List<SysMenu> result = null; @@ -199,7 +198,8 @@ if (CollectionUtil.isEmpty(roles)) { return ResultBody.ok().data(Collections.emptyList()); } - List<SysMenu> menus = menuService.findByRoleCodes(roles.parallelStream().map(SysRole::getCode).collect(Collectors.toSet()), CommonConstant.MENU); + Set<String> collect = roles.stream().map(e -> e.getCode()).collect(Collectors.toSet()); + List<SysMenu> menus = menuService.findByRoleCodes(collect, CommonConstant.MENU); return ResultBody.ok().data(treeBuilder(menus)); } } -- Gitblit v1.8.0