From ad02a8de075167c7e948c5bf9680c96e62f3f16b Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 6 Jun 2024 10:50:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?stream=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/TrainingExperienceServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index eabcedfef..4e307ed60 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -159,8 +159,10 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr return leaseBaseInfoDO; } List userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByMappingIds); - String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.joining(CommonConstants.COMMA)); - leaseBaseInfoDO.setStoreManager(nameList); + if (CollectionUtils.isNotEmpty(userInfoByUserIds)){ + String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.joining(CommonConstants.COMMA)); + leaseBaseInfoDO.setStoreManager(nameList); + } return leaseBaseInfoDO; } From 6241fa7cb3cad9cb89534a83bc880337450d843e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 6 Jun 2024 10:57:31 +0800 Subject: [PATCH 2/2] order --- .../cool/store/service/impl/FirstOrderServiceImp.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java index 785dbebee..6b0680ab8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java @@ -158,13 +158,15 @@ public class FirstOrderServiceImp implements FirstOrderService { } else { order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus()); } - if (Objects.nonNull(shopInfo.getSupervisorUserId())){ - EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); - order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber()); - } } catch (Exception e) { log.error("获取鲜丰订货金异常", e); } + }else { + order = new FirstOrderDTO(); + if (Objects.nonNull(shopInfo.getSupervisorUserId())){ + EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); + order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber()); + } } return order; }