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
---
seller-api/src/main/java/cn/lili/controller/permission/ClerkStoreController.java | 41 +----------------------------------------
1 files changed, 1 insertions(+), 40 deletions(-)
diff --git a/seller-api/src/main/java/cn/lili/controller/permission/ClerkStoreController.java b/seller-api/src/main/java/cn/lili/controller/permission/ClerkStoreController.java
index c60c98a..a799996 100644
--- a/seller-api/src/main/java/cn/lili/controller/permission/ClerkStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/permission/ClerkStoreController.java
@@ -80,46 +80,7 @@
@PostMapping
@ApiOperation(value = "娣诲姞搴楀憳")
public ResultMessage<Object> add(@Valid ClerkAddDTO clerkAddDTO) {
- int rolesMaxSize = 10;
- try {
- if (clerkAddDTO.getRoles() != null && clerkAddDTO.getRoles().size() >= rolesMaxSize) {
- throw new ServiceException(ResultCode.PERMISSION_BEYOND_TEN);
- }
- //鏍￠獙鏄惁宸茬粡鏄細鍛�
- Member member = memberService.findByMobile(clerkAddDTO.getMobile());
- if (member == null) {
- //娣诲姞浼氬憳
- MemberAddDTO memberAddDTO = new MemberAddDTO();
- memberAddDTO.setMobile(clerkAddDTO.getMobile());
- memberAddDTO.setPassword(clerkAddDTO.getPassword());
- memberAddDTO.setUsername(clerkAddDTO.getUsername());
- member = memberService.addMember(memberAddDTO);
- } else {
- //鏍￠獙瑕佹坊鍔犵殑浼氬憳鏄惁宸茬粡鏄簵涓�
- if (Boolean.TRUE.equals(member.getHaveStore())) {
- throw new ServiceException(ResultCode.STORE_APPLY_DOUBLE_ERROR);
- }
- //鏍￠獙浼氬憳鐨勬湁鏁堟��
- if (Boolean.FALSE.equals(member.getDisabled())) {
- throw new ServiceException(ResultCode.USER_STATUS_ERROR);
- }
- }
- //娣诲姞搴楀憳
- clerkAddDTO.setMemberId(member.getId());
- clerkAddDTO.setShopkeeper(false);
- clerkAddDTO.setStoreId(UserContext.getCurrentUser().getStoreId());
- clerkService.saveClerk(clerkAddDTO);
- //淇敼姝や細鍛樻嫢鏈夊簵閾�
- List<String> ids = new ArrayList<>();
- ids.add(member.getId());
- memberService.updateHaveShop(true, UserContext.getCurrentUser().getStoreId(), ids);
- } catch (ServiceException se) {
- log.info(se.getMsg(), se);
- throw se;
- } catch (Exception e) {
- log.error("娣诲姞搴楀憳鍑洪敊", e);
- }
- return ResultUtil.success();
+ return clerkService.addClerk(clerkAddDTO);
}
--
Gitblit v1.8.0