From fc51797e2d926df6777239e6f4af722d573e130e Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Tue, 8 Apr 2025 16:44:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=BA=97=E9=93=BA=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/ShopBranchServiceImpl.java | 6 +++--- .../service/account/service/impl/ShopInfoServiceImpl.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopBranchServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopBranchServiceImpl.java index c6779939..fa83b3c9 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopBranchServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopBranchServiceImpl.java @@ -89,7 +89,7 @@ public class ShopBranchServiceImpl implements ShopBranchService { throw new CzgException("主店铺配置信息不存在"); } if (ShopTypeEnum.ONLY.getValue().equals(shopInfo.getShopType())) { - throw new CzgException("数据错误：主单店铺类型为单店"); + throw new CzgException("数据错误：主店铺类型为单店"); } if (ObjUtil.defaultIfNull(shopInfo.getIsHeadShop(), 0) == YesNoEnum.NO.value()) { throw new CzgException("数据错误：当前店铺不是主店"); @@ -128,7 +128,7 @@ public class ShopBranchServiceImpl implements ShopBranchService { throw new CzgException("主店铺配置信息不存在"); } if (ShopTypeEnum.ONLY.getValue().equals(shopInfo.getShopType())) { - throw new CzgException("数据错误：主单店铺类型为单店"); + throw new CzgException("数据错误：主店铺类型为单店"); } if (ObjUtil.defaultIfNull(shopInfo.getIsHeadShop(), 0) == YesNoEnum.NO.value()) { throw new CzgException("数据错误：当前店铺不是主店"); @@ -157,7 +157,7 @@ public class ShopBranchServiceImpl implements ShopBranchService { throw new CzgException("主店铺配置信息不存在"); } if (ShopTypeEnum.ONLY.getValue().equals(shopInfo.getShopType())) { - throw new CzgException("数据错误：主单店铺类型为单店"); + throw new CzgException("数据错误：主店铺类型为单店"); } if (ObjUtil.defaultIfNull(shopInfo.getIsHeadShop(), 0) == YesNoEnum.NO.value()) { throw new CzgException("数据错误：当前店铺不是主店"); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index dd268e5c..64893aee 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -243,9 +243,9 @@ public class ShopInfoServiceImpl extends ServiceImpl i public Boolean edit(ShopInfoEditDTO shopInfoEditDTO) { ShopInfo shopInfo; if (!StpKit.USER.isAdmin()) { - shopInfo = queryChain().eq(ShopInfo::getId, shopInfoEditDTO.getId()).one(); + shopInfo = queryChain().eq(ShopInfo::getId, StpKit.USER.getLoginIdAsLong()).one(); } else { - shopInfo = getById(StpKit.USER.getLoginIdAsLong()); + shopInfo = getById(shopInfoEditDTO.getId()); } if (shopInfo == null) { throw new CzgException("店铺不存在"); @@ -260,8 +260,8 @@ public class ShopInfoServiceImpl extends ServiceImpl i if (!isHeadShop.equals(shopInfoEditDTO.getIsHeadShop())) { throw new CzgException("禁止修改是否主店"); } - if (!mainId.equals(shopInfoEditDTO.getMainId())) { - throw new CzgException("禁止从新选择店铺设为主店"); + if (mainId != null && !mainId.equals(shopInfoEditDTO.getMainId())) { + throw new CzgException("禁止重新选择店铺设为主店"); } if (shopInfoEditDTO.getActivateCode() != null) { activateShop(shopInfo, shopInfoEditDTO.getActivateCode());