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

remove avatar

Browse Source
This commit is contained in:
guohb
2024-04-28 15:46:38 +08:00
parent 272dca701f
commit d034da7519
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java
View File

@@ -88,17 +88,6 @@ public class ShopAuditInfoDO {
@ApiModelProperty("数据类型 0-提交 1-审批")
private Integer dataType;
@ApiModelProperty("头像")
private String avatar;
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
/**
* @return id
*/

18
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
View File

@@ -100,15 +100,15 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
List<ShopAuditInfoDO> listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode());
List<String> userIds = listByShopIdAndType.stream().map(ShopAuditInfoDO::getSubmittedUserId).collect(Collectors.toList());
List<EnterpriseUserDO> userInfoByUserIds = new ArrayList<>();
if (CollectionUtils.isNotEmpty(userIds)){
userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds);
Map<String, String> userAvatarMap = userInfoByUserIds.stream()
.filter(item -> StringUtil.isNotBlank(item.getUserId()) && StringUtil.isNotBlank(item.getAvatar()))
.collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar()));
listByShopIdAndType.stream().forEach( item -> {
item.setAvatar(userAvatarMap.get(item.getSubmittedUserId()));
});
}
// if (CollectionUtils.isNotEmpty(userIds)){
// userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds);
// Map<String, String> userAvatarMap = userInfoByUserIds.stream()
// .filter(item -> StringUtil.isNotBlank(item.getUserId()) && StringUtil.isNotBlank(item.getAvatar()))
// .collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar()));
// listByShopIdAndType.stream().forEach( item -> {
// item.setAvatar(userAvatarMap.get(item.getSubmittedUserId()));
// });
// }
submitLicenseResponse.setProcessRecords(listByShopIdAndType);
return submitLicenseResponse;
}