diff --git a/inside-notices/pom.xml b/inside-notices/pom.xml index bcd781b0..ffedbcab 100644 --- a/inside-notices/pom.xml +++ b/inside-notices/pom.xml @@ -173,7 +173,7 @@ cn.axzo.meepo - meepo-api + meepo-api-definition cn.axzo.basics diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/V3ExtPopulator.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/V3ExtPopulator.java index 3c601390..e49921d9 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/V3ExtPopulator.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/V3ExtPopulator.java @@ -6,8 +6,8 @@ import cn.axzo.basics.profiles.dto.basic.BasicDto; import cn.axzo.basics.profiles.dto.basic.PersonProfileDto; import cn.axzo.basics.profiles.dto.basic.ProfessionTagDto; import cn.axzo.basics.profiles.dto.basic.WorkerProfileDto; -import cn.axzo.meepo.api.BankCardApi; -import cn.axzo.meepo.api.dto.response.WorkerBankCardRes; +import cn.axzo.meepo.api.definition.bankcard.query.BankCardApi; +import cn.axzo.meepo.api.definition.bankcard.query.dto.response.WorkerBankCardApiRes; import cn.axzo.msg.center.common.utils.BizAssertions; import cn.axzo.msg.center.service.enums.KVContentType; import cn.axzo.msg.center.service.pending.response.v3.model.ComponentWorkerGroup; @@ -106,12 +106,12 @@ public class V3ExtPopulator { .map(BasicDto::getId) .distinct() .collect(toList()); - List bankCardRes = null; + List bankCardRes = null; if (CollectionUtils.isNotEmpty(personIds)) - bankCardRes = BizAssertions.assertResponse(bankCardApi.batchGetBankByAxzoUserId(personIds)); - Map> personId2BankCard = bankCardRes == null + bankCardRes = BizAssertions.assertResponse(bankCardApi.batchGetBankCardByPersonId(personIds)); + Map> personId2BankCard = bankCardRes == null ? Collections.emptyMap() - : bankCardRes.stream().collect(groupingBy(WorkerBankCardRes::getPersonId)); + : bankCardRes.stream().collect(groupingBy(WorkerBankCardApiRes::getPersonId)); for (ComponentWorkerGroup workerGroup : groups) { WorkerProfileDto worker = workerIdentityId2WorkerProfile.get(workerGroup.getWorkerIdentityId()); if (worker == null) { @@ -130,7 +130,7 @@ public class V3ExtPopulator { workerInfo.setIdNumber(person.getIdNumber()); workerInfo.setIdNumberCiphertext(DataSecurityHelper.encrypt(person.getIdNumber())); workerInfo.setIdentityValid(isWorkerIdentityValid(worker)); - List bankCards = personId2BankCard.get(worker.getPersonProfile().getId()); + List bankCards = personId2BankCard.get(worker.getPersonProfile().getId()); workerInfo.setCardValid(CollectionUtils.isNotEmpty(bankCards) && StringUtils.isNotBlank(bankCards.get(0).getBankCardNo())); workerInfo.setProfessionNames(worker.getProfessionTags().stream() diff --git a/pom.xml b/pom.xml index 1478aa15..b1cf17a4 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,12 @@ workflow-engine-spring-boot-starter ${workflow.version} + + + cn.axzo.meepo + meepo-api-definition + 2.0.0-SNAPSHOT + diff --git a/start/pom.xml b/start/pom.xml index 790bf418..22b8a5cf 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -82,6 +82,12 @@ io.github.openfeign feign-httpclient + + + cn.axzo.meepo + meepo-api-definition + + diff --git a/start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java b/start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java index a4a5b827..c3256d58 100644 --- a/start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java +++ b/start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java @@ -26,7 +26,7 @@ import org.springframework.core.env.Environment; "cn.axzo.basics.profiles.api", "cn.axzo.apollo.api", "cn.axzo.msg.center.inside.notices.service.impl", - "cn.axzo.meepo.api", + "cn.axzo.meepo.api.definition.bankcard.query", "cn.axzo.riven.client.feign", "cn.axzo.epic.client.feign", "cn.axzo.orggateway.api.orgteamourelation"