From 89fbb4667faea442e0d41a5a57376f0bb7a5f472 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 13 十月 2022 17:52:51 +0800
Subject: [PATCH] 店铺编号,自定义菜单快捷入口
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 9 ++++++---
ycl-common/src/main/java/com/ycl/entity/user/AdminMenuRelation.java | 5 +++++
ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java | 1 -
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml | 11 ++++++++++-
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 5 +++++
5 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/AdminMenuRelation.java b/ycl-common/src/main/java/com/ycl/entity/user/AdminMenuRelation.java
index 7536626..2047fa0 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/AdminMenuRelation.java
+++ b/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;
}
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 9125d9e..86a520b 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/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(","));
}
diff --git a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
index 3d8bac3..af61816 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
+++ b/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
diff --git a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
index 3fde2c6..3cb4d0f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
+++ b/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()));
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index b90b616..c56bec7 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/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) {
--
Gitblit v1.8.0