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

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

Browse Source
This commit is contained in:
苏竹红
2024-04-28 14:21:08 +08:00
parent 694793b421 9ecd7aa17e
commit 8901681cef
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.service.ApplyLicenseService;
import com.cool.store.service.RegionService;
import com.cool.store.utils.StringUtil;
import com.cool.store.utils.poi.constant.Constants;
import com.cool.store.vo.OpenAcceptanceInfoListVO;
import com.github.pagehelper.PageHelper;
@@ -98,11 +99,16 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
SubmitLicenseResponse submitLicenseResponse = SubmitLicenseResponse.from(result);
List<ShopAuditInfoDO> listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode());
List<String> userIds = listByShopIdAndType.stream().map(ShopAuditInfoDO::getSubmittedUserId).collect(Collectors.toList());
List<EnterpriseUserDO> userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds);
Map<String, String> userAvatarMap = userInfoByUserIds.stream().collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar()));
listByShopIdAndType.stream().forEach( item -> {
item.setAvatar(userAvatarMap.get(item.getSubmittedUserId()));
});
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()));
});
}
submitLicenseResponse.setProcessRecords(listByShopIdAndType);
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/**",
"/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery",
"/xfsg/*/api/audit/result",
"/xfsg/mini/line/getRegionPayPic",
"/xfsg/mini/**"
"/xfsg/mini/line/getRegionPayPic"
);