From 34aa7dbc20e5d146e5d18c3e1d4d880354457129 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 24 Jul 2025 16:06:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E8=A3=85=E4=BF=AE=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/OrderSysInfoServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index 54cdc27a7..f0952e1c8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -176,6 +176,10 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { @Override @Transactional(rollbackFor = Exception.class) public Integer audit(AuditRequest request, LoginUserInfo user) { + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + if (shopInfo.getShopDecorationAttributes() == null){ + throw new ServiceException(ErrorCodeEnum.SHOP_DECORATION_ATTRIBUTES_IS_NULL); + } String curUserId = user.getUserId(); request.setOperateUserId(user.getUserId()); request.setOperateUserName(user.getName()); @@ -196,7 +200,6 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { //查询毛泽军下级区域 只有毛泽军的下级需要总裁处理 其他不需要总裁处理: List regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(specialUserId); //是否有总裁处理flag - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); Boolean flag = Boolean.FALSE; //如果是毛泽军的下级 则需要总裁处理 if (shopInfo != null && shopInfo.getRegionId() != null) { @@ -272,9 +275,6 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { } public void updateDecorationStage(Long shopId){ ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); - if (shopInfo.getShopDecorationAttributes() == null){ - throw new ServiceException(ErrorCodeEnum.SHOP_DECORATION_ATTRIBUTES_IS_NULL); - } if (shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { //老店新开时装修与开业直接完成 shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(Arrays.asList(shopId), Arrays.asList(