wl
2022-10-13 89fbb4667faea442e0d41a5a57376f0bb7a5f472
店铺编号,自定义菜单快捷入口
5个文件已修改
31 ■■■■ 已修改文件
ycl-common/src/main/java/com/ycl/entity/user/AdminMenuRelation.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/entity/user/AdminMenuRelation.java
@@ -45,5 +45,10 @@
    @TableField("is_start")
    private Integer isStart;
    /**
     * 菜单序号
     */
    @TableField("sort")
    private Integer sort;
}
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -81,6 +81,8 @@
    UmsRoleMenuRelationMapper umsRoleMenuRelationMapper;
    @Resource
    AdminMenuRelationMapper adminMenuRelationMapper;
    @Resource
    UmsMenuMapper umsMenuMapper;
    @Override
    public UmsAdmin getAdminByUsername(String username) {
@@ -148,10 +150,11 @@
                    .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
                            .eq(UmsRoleMenuRelation::getRoleId, maxId))
                    .stream()
                    .forEach(item->{
                    .forEach(item -> {
                        AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
                        adminMenuRelation.setAdminId(umsAdmin.getId());
                        adminMenuRelation.setMenuId(item.getMenuId());
                        adminMenuRelation.setSort(umsMenuMapper.selectOne(new LambdaQueryWrapper<UmsMenu>().eq(UmsMenu::getId, item.getMenuId())).getSort());
                        adminMenuRelationMapper.insert(adminMenuRelation);
                    });
        }
@@ -416,11 +419,11 @@
        QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
        wrapperUser.in("id", arr);
        List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
        if (adminList == null||adminList.isEmpty()) {
        if (adminList == null || adminList.isEmpty()) {
            throw new ApiException("未查询到用户");
        }
        if ("02".equals(sendType)) {
           str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
            str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
        } else {
            str = adminList.stream().map(UmsAdmin::getMobile).collect(Collectors.joining(","));
        }
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -62,7 +62,16 @@
        SELECT
            amr.id AS relationId,
            amr.is_start AS isStart,
            m.*
            amr.sort,
            m.id,
            m.parent_id AS parentId,
            m.title,
            m.url,
            m.`level`,
            m.description,
            m.create_time as createTime,
            m.hidden,
            m.icon
        FROM
            `ums_admin_menu_relation` AS amr
                JOIN ums_menu AS m ON amr.menu_id = m.id
ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
@@ -110,7 +110,6 @@
    @ApiOperation("菜单权限-个人菜单查询")
    @GetMapping("/menu/search_myself")
    @LogSave(contain = "登录拿到个人菜单",operationType = "个人操作")
    public CommonResult searchMenusMyself() {
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        return CommonResult.success(umsMenuService.ListTreeMyself(user.getUserId()));
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.common.util.UtilNumber;
import com.ycl.dto.UmsStoreInfoParam;
import com.ycl.entity.store.StoreInfo;
import com.ycl.service.store.StoreInfoService;
@@ -27,6 +28,9 @@
@Api(tags = "门店管理")
public class StoreInfoController {
    private StoreInfoService storeInfoService;
    @Autowired
    UtilNumber utilNumber;
    @Autowired
    public void setUmsStoreInfoService(StoreInfoService umsStoreInfoService) {
@@ -62,6 +66,7 @@
                .storeAddress(umsStoreInfoParam.getStoreaddr())
                .storePhoto(umsStoreInfoParam.getStorephoto())
                .idCardInfo(umsStoreInfoParam.getIdcardinfo())
                .storeNumber(utilNumber.createShopCode())
                .storeScore(umsStoreInfoParam.getStorescore()).build();
        boolean success = storeInfoService.save(storeInfo);
        if (success) {