suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20240606_lastFix' into 'master'

Browse Source 
Cc 20240606 last fix

See merge request hangzhou/java/custom_xfsg!12
This commit is contained in:
zhangchenbiao
2024-06-06 03:01:18 +00:00
parent b88b93b057 6241fa7cb3
commit 588d2665ef
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
View File

@@ -158,13 +158,15 @@ public class FirstOrderServiceImp implements FirstOrderService {
} else { } else {
order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus()); 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) { } catch (Exception e) {
log.error("获取鲜丰订货金异常", 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; return order;
} }

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java
View File

@@ -159,8 +159,10 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr
return leaseBaseInfoDO; return leaseBaseInfoDO;
} }
List<EnterpriseUserDO> userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByMappingIds); List<EnterpriseUserDO> userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByMappingIds);
String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.joining(CommonConstants.COMMA)); if (CollectionUtils.isNotEmpty(userInfoByUserIds)){
leaseBaseInfoDO.setStoreManager(nameList); String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.joining(CommonConstants.COMMA));
leaseBaseInfoDO.setStoreManager(nameList);
}
return leaseBaseInfoDO; return leaseBaseInfoDO;
} }