From 9fcc5df6b91c72fcc76c615ba272d255d493dfd5 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 1 Aug 2024 18:13:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=91=98=E5=B7=A5=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=20=E5=91=98=E5=B7=A5=E7=99=BB=E5=BD=95=20?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/rest/AuthorizationController.java | 11 +++++++++-- .../shop/TbPlussShopStaffRepository.java | 3 +++ .../shopimpl/TbPlussShopStaffServiceImpl.java | 2 +- .../cashier/system/repository/RoleRepository.java | 1 + .../system/service/impl/RoleServiceImpl.java | 15 +++++++-------- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java index f5ab968d..fc8f93f5 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java @@ -99,6 +99,7 @@ public class AuthorizationController { throw new BadRequestException("验证码错误"); } String loginpre=""; + String shopId=""; // 判断是否是员工登录 if (authUser.getLoginType() != null && "staff".equals(authUser.getLoginType())) { if (StrUtil.isBlank(authUser.getMerchantName())) { @@ -109,7 +110,8 @@ public class AuthorizationController { if (merchant == null) { throw new BadRequestException("商户不存在"); } - loginpre=merchant.getShopId() + "@"; + loginpre = merchant.getShopId() + "@"; + shopId = merchant.getShopId(); } //生成token @@ -123,7 +125,12 @@ public class AuthorizationController { // SecurityContextHolder.getContext().setAuthentication(authentication); final JwtUserDto jwtUserDto = (JwtUserDto) authentication.getPrincipal(); // TbShopInfo byAccount = tbShopInfoRepository.findByAccount(jwtUserDto.getUsername()); - TbPlussShopStaff tbPlussShopStaff = staffRepository.queryByAccount(authUser.getUsername()); + TbPlussShopStaff tbPlussShopStaff; + if (authUser.getLoginType() != null && "staff".equals(authUser.getLoginType())) { + tbPlussShopStaff = staffRepository.queryByAccount(authUser.getUsername(),shopId); + } else { + tbPlussShopStaff = staffRepository.queryByAccount(authUser.getUsername()); + } if (tbPlussShopStaff != null && tbPlussShopStaff.getType().equals("staff")) { Integer isManage = tbPlussShopStaff.getIsManage(); if (isManage != null && isManage != 1) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java index b7d4a6a5..f8429d07 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java @@ -45,6 +45,9 @@ public interface TbPlussShopStaffRepository extends JpaRepository, JpaSpecificat * @return / */ Role findByName(String name); + Role findByNameAndShopId(String name,Integer shopId); /** * 删除多个角色 diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/impl/RoleServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/impl/RoleServiceImpl.java index 650ddd28..1413ceea 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/impl/RoleServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/impl/RoleServiceImpl.java @@ -91,8 +91,8 @@ public class RoleServiceImpl implements RoleService { @Override @Transactional(rollbackFor = Exception.class) public void create(Role resources) { - if (roleRepository.findByName(resources.getName()) != null) { - throw new EntityExistException(Role.class, "username", resources.getName()); + if (roleRepository.findByNameAndShopId(resources.getName(),resources.getShopId()) != null) { + throw new BadRequestException("角色已存在"); } roleRepository.save(resources); } @@ -101,13 +101,12 @@ public class RoleServiceImpl implements RoleService { @Transactional(rollbackFor = Exception.class) public void update(Role resources) { Role role = roleRepository.findById(resources.getId()).orElseGet(Role::new); - ValidationUtil.isNull(role.getId(), "Role", "id", resources.getId()); - - Role role1 = roleRepository.findByName(resources.getName()); - - if (role1 != null && !role1.getId().equals(role.getId())) { - throw new EntityExistException(Role.class, "username", resources.getName()); + if (!resources.getName().equals(role.getName())) { + if (roleRepository.findByNameAndShopId(resources.getName(),resources.getShopId()) != null) { + throw new BadRequestException("修改失败,角色名称不可重复"); + } } + ValidationUtil.isNull(role.getId(), "Role", "id", resources.getId()); role.setName(resources.getName()); role.setDescription(resources.getDescription()); role.setDataScope(resources.getDataScope()); From d2a18664eaedb378d6ca34311ab80dfd2f208415 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 1 Aug 2024 18:15:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productimpl/TbProductServiceImpl.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index 7d6993f6..9acaacdd 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -491,28 +491,13 @@ public class TbProductServiceImpl implements TbProductService { // } // } if ("sku".equals(save.getTypeEnum())) { -// List collect = resources.getSkuList().stream().map(TbProductSku::getId).collect(Collectors.toList()); + List collect = resources.getSkuList().stream().map(TbProductSku::getId).collect(Collectors.toList()); List tbProductSkus = tbProductSkuRepository.searchSku(resources.getId().toString()); - List collect = tbProductSkus.stream().map(TbProductSku::getId).collect(Collectors.toList()); - HashMap skuInfo = new HashMap<>(); for (TbProductSku productSkus : tbProductSkus) { - skuInfo.put(productSkus.getId().toString(), productSkus); - } - for (TbProductSku tbProductSku : resources.getSkuList()) { - if (!collect.contains(tbProductSku.getId())) { - tbProductSkuRepository.deleteBySkuId(tbProductSku.getId()); - }else { - TbProductSku productSku = skuInfo.get(tbProductSku.getId().toString()); - if (productSku != null) { - tbProductSku.setIsGrounding(productSku.getIsGrounding()); - } + if (!collect.contains(productSkus.getId())) { + tbProductSkuRepository.deleteBySkuId(productSkus.getId()); } } -// for (TbProductSku productSkus : tbProductSkus) { -// if (!collect.contains(productSkus.getId())) { -// tbProductSkuRepository.deleteBySkuId(productSkus.getId()); -// } -// } } tbProductSkuRepository.saveAll(resources.getSkuList()); } From 16c6ff1ccf9cb395608fd4f4339cf040976fd482 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 1 Aug 2024 18:21:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/controller/product/StockController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java index bebca5c4..8326bb57 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java @@ -114,7 +114,7 @@ public class StockController { } - @Log("商品库存:上下架商品") + @Log("商品库存 上下架商品") @PutMapping("/grounding") @ApiOperation("上下架商品") public ResponseEntity grounding( @@ -141,7 +141,7 @@ public class StockController { return new ResponseEntity<>(HttpStatus.OK); } - @Log("商品库存:修改商品状态") + @Log("商品库存 修改商品状态") @PutMapping("productStatus") public ResponseEntity updateProductStatus(@RequestBody StockUpdateValueVO updateValueVO) { stockService.updateProductStatus(updateValueVO);