Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

This commit is contained in:
苏竹红
2024-05-26 16:27:14 +08:00

View File

@@ -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) ? "" : supervisor.getUserId());//更新督导
SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).build());
shopInfoDO.setShopName(systemBuildingShopDO.getStoreName());//更新铺位名称
shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO);
@@ -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;