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

avatar

Browse Source
This commit is contained in:
guohb
2024-04-28 14:19:37 +08:00
parent 0dfa16b00c
commit 9ecd7aa17e
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ import com.cool.store.response.LicenseListResponse;
import com.cool.store.response.SubmitLicenseResponse; import com.cool.store.response.SubmitLicenseResponse;
import com.cool.store.service.ApplyLicenseService; import com.cool.store.service.ApplyLicenseService;
import com.cool.store.service.RegionService; import com.cool.store.service.RegionService;
import com.cool.store.utils.StringUtil;
import com.cool.store.utils.poi.constant.Constants; import com.cool.store.utils.poi.constant.Constants;
import com.cool.store.vo.OpenAcceptanceInfoListVO; import com.cool.store.vo.OpenAcceptanceInfoListVO;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
@@ -98,11 +99,16 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
SubmitLicenseResponse submitLicenseResponse = SubmitLicenseResponse.from(result); SubmitLicenseResponse submitLicenseResponse = SubmitLicenseResponse.from(result);
List<ShopAuditInfoDO> listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode()); List<ShopAuditInfoDO> listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode());
List<String> userIds = listByShopIdAndType.stream().map(ShopAuditInfoDO::getSubmittedUserId).collect(Collectors.toList()); List<String> userIds = listByShopIdAndType.stream().map(ShopAuditInfoDO::getSubmittedUserId).collect(Collectors.toList());
List<EnterpriseUserDO> userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds); List<EnterpriseUserDO> userInfoByUserIds = new ArrayList<>();
Map<String, String> userAvatarMap = userInfoByUserIds.stream().collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar())); if (CollectionUtils.isNotEmpty(userIds)){
listByShopIdAndType.stream().forEach( item -> { userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds);
item.setAvatar(userAvatarMap.get(item.getSubmittedUserId())); 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); submitLicenseResponse.setProcessRecords(listByShopIdAndType);
return submitLicenseResponse; return submitLicenseResponse;
} }

3
coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
View File

@@ -58,8 +58,7 @@ public class SignValidateFilter implements Filter {
"/**/webjars/**", "/**/webjars/**",
"/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery", "/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery",
"/xfsg/*/api/audit/result", "/xfsg/*/api/audit/result",
"/xfsg/mini/line/getRegionPayPic", "/xfsg/mini/line/getRegionPayPic"
"/xfsg/mini/**"
); );