From 4548318feeb4baf78426c6660a31babe07483e4f Mon Sep 17 00:00:00 2001 From: guohb Date: Sun, 26 May 2024 12:30:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9D=A3=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/SysStoreAppServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index dd733999d..2f367a041 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -441,7 +441,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); shopInfoDO.setStoreNum(request.getStoreNum()); //更新门店编码 - shopInfoDO.setSupervisorUserId(StringUtils.isBlank(supervisor.getUserId()) ? "" : supervisor.getUserId());//更新督导 + shopInfoDO.setSupervisorUserId(Objects.isNull(supervisor.getUserId()) ? "" : supervisor.getUserId());//更新督导 SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).build()); shopInfoDO.setShopName(systemBuildingShopDO.getStoreName());//更新铺位名称 shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); From 02b2578d563b518c1bc384640aadd0f5df281adf Mon Sep 17 00:00:00 2001 From: guohb Date: Sun, 26 May 2024 12:36:04 +0800 Subject: [PATCH 2/3] supervisor --- .../com/cool/store/service/impl/SysStoreAppServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index 2f367a041..fbaf707fb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -441,7 +441,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); shopInfoDO.setStoreNum(request.getStoreNum()); //更新门店编码 - shopInfoDO.setSupervisorUserId(Objects.isNull(supervisor.getUserId()) ? "" : supervisor.getUserId());//更新督导 + shopInfoDO.setSupervisorUserId(Objects.isNull(supervisor) ? "" : supervisor.getUserId());//更新督导 SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).build()); shopInfoDO.setShopName(systemBuildingShopDO.getStoreName());//更新铺位名称 shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); From f5c4d9a60d0fc44409023ca61e0059b4c66619d1 Mon Sep 17 00:00:00 2001 From: guohb Date: Sun, 26 May 2024 12:48:29 +0800 Subject: [PATCH 3/3] message --- .../java/com/cool/store/service/impl/SysStoreAppServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index fbaf707fb..f1b989e58 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -459,6 +459,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe //更新阶段状态 shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, shopSubStageStatusEnum, shopAuditInfoDO.getId()); } catch (Exception e) { + log.error("auditResult message:{}",e.getMessage()); throw new ServiceException(ErrorCodeEnum.UNKNOWN); } return true;