From 4372e6406222ce6b33f8c1c0703b460d39b5814e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 23 六月 2025 14:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java
index 87891a6..6501fb8 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java
@@ -2,13 +2,26 @@
import cn.lili.base.Result;
+import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.common.utils.StringUtils;
+import cn.lili.common.validation.Phone;
+import cn.lili.common.vo.ResultMessage;
+import cn.lili.common.vo.SearchVO;
import cn.lili.group.Add;
import cn.lili.group.Update;
import cn.lili.modules.lmk.domain.form.StoreMemberForm;
+import cn.lili.modules.lmk.domain.query.CheckClerkMobileQuery;
import cn.lili.modules.lmk.domain.query.StoreMemberQuery;
import cn.lili.modules.lmk.service.StoreMemberService;
import cn.lili.modules.member.entity.dos.Member;
+import cn.lili.modules.member.entity.dos.StoreDepartment;
+import cn.lili.modules.member.entity.vo.StoreDepartmentVO;
+import cn.lili.modules.member.service.ClerkService;
import cn.lili.modules.member.service.MemberService;
+import cn.lili.modules.member.service.StoreDepartmentService;
+import cn.lili.modules.member.service.StoreRoleService;
+import cn.lili.mybatis.util.PageUtil;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
@@ -33,6 +46,23 @@
private final StoreMemberService storeMemberService;
private final MemberService memberService;
+ private final StoreRoleService storeRoleService;
+ private final StoreDepartmentService storeDepartmentService;
+ private final ClerkService clerkService;
+
+ @GetMapping
+ @RequestMapping("/getStoreRoleList")
+ public Result getStoreRoleList(){
+ return Result.ok().data(storeRoleService.getSelectList());
+ }
+
+ @PostMapping("/check")
+ @ApiOperation(value = "妫�娴嬫墜鏈哄彿鐮佹湁鏁堟��")
+ public Result check(@RequestBody CheckClerkMobileQuery checkClerkMobileQuery) {
+ System.out.println(checkClerkMobileQuery);
+ return Result.ok().data(clerkService.checkClerk(checkClerkMobileQuery.getMemberId(),checkClerkMobileQuery.getMobile()));
+ }
+
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
@@ -44,6 +74,13 @@
@ApiOperation(value = "閲嶇疆瀵嗙爜", notes = "閲嶇疆瀵嗙爜")
public Result restPassword(@PathVariable String id){
return memberService.resetPassword(id);
+ }
+ @GetMapping("/store/department")
+ @ApiOperation(value = "鑾峰彇鏍戠姸缁撴瀯")
+ public Result getByPage(StoreDepartment entity, SearchVO searchVo) {
+ entity.setStoreId(UserContext.getCurrentUser().getStoreId());
+ return Result.ok().data(storeDepartmentService.tree(PageUtil.initWrapper(entity, searchVo)));
+
}
@PutMapping
@@ -70,6 +107,12 @@
return storeMemberService.page(query);
}
+ @GetMapping("/checkPermission")
+ @ApiOperation(value = "鑾峰緱褰撳墠鐢ㄦ埛鐨勫簵鍛樻潈闄�", notes = "鑾峰緱褰撳墠鐢ㄦ埛鐨勫簵鍛樻潈闄�")
+ public Result checkDelAndUpdatePermission(){
+ return storeMemberService.checkDelAndUpdatePermission();
+ }
+
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
public Result detail(@PathVariable("id") String id) {
--
Gitblit v1.8.0