treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/BKI-3241 // http://jira.mfd.msk:8088/browse/BKI-3337

Browse source
This commit is contained in:
etreschenkov 2026-01-15 12:47:06 +03:00
parent 5c1d9ccd2a
commit e92111273f
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilderV2.java
View file

@ -55,7 +55,7 @@ public class PersonFactoryBuilderV2 {
person.setPn(passportData.getSerNum()); person.setPn(passportData.getSerNum());
person.setPd(DATE_FORMAT.format(LocalDate.now())); // Do not use passport iss_date. Signal service could reject the package person.setPd(DATE_FORMAT.format(LocalDate.now())); // Do not use passport iss_date. Signal service could reject the package
person.setDt(getDt(passportData.getIdType(), passportData.getIdType2())); person.setDt(passportData.getIdType());
if (person.getDt() != null && person.getDt().equals("999")) { if (person.getDt() != null && person.getDt().equals("999")) {
person.setOdt(ODT); person.setOdt(ODT);
person.setConsentOdt(ODT); person.setConsentOdt(ODT);

2
src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java
View file

@ -64,7 +64,7 @@ public class PersonServiceV2 {
*/ */
public Map<String, Name> findNameByNumber(List<SubjectProfile> subjects) { public Map<String, Name> findNameByNumber(List<SubjectProfile> subjects) {
List<String> phones = subjects.stream() List<String> phones = subjects.stream()
.map(subject -> CTUtil.normalizePhoneNumber(subject.getPhone().toString())) .map(subject -> CTUtil.normalizePhoneNumber(subject.getPhone()))
.toList(); .toList();
List<Name> names = mapper.findNameData(phones); List<Name> names = mapper.findNameData(phones);

2
src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameEnricher.java
View file

@ -72,7 +72,7 @@ public class FidNameEnricher implements Handler<SubjectPayload, SubjectPayload>
fillByCache(subject, cachedRecords.get(phone)); fillByCache(subject, cachedRecords.get(phone));
} else { } else {
cacheMisses.incrementAndGet(); cacheMisses.incrementAndGet();
Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(phone.toString())); Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(phone));
if (name == null) { if (name == null) {
return Stream.of(PhonesMap.builder() return Stream.of(PhonesMap.builder()
.phone(phone) .phone(phone)

2
src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameUpdater.java
View file

@ -40,7 +40,7 @@ public class FidNameUpdater implements Handler<SubjectPayload, SubjectPayload> {
List<SubjectProfile> changingFidPhones = new ArrayList<>(); List<SubjectProfile> changingFidPhones = new ArrayList<>();
List<Long> notFoundFidPhones = new ArrayList<>(); List<Long> notFoundFidPhones = new ArrayList<>();
subjects.forEach(subjectProfile -> { subjects.forEach(subjectProfile -> {
Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(subjectProfile.getPhone().toString())); Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(subjectProfile.getPhone()));
if (name == null) { if (name == null) {
notFoundFidPhones.add(subjectProfile.getPhone()); notFoundFidPhones.add(subjectProfile.getPhone());
} else if (!subjectProfile.getFid().equals(name.getFid())) { } else if (!subjectProfile.getFid().equals(name.getFid())) {

2
src/main/java/ru/nbch/credit_tracker/service/task/impl/FidUpdateNameEnricher.java
View file

@ -56,7 +56,7 @@ public class FidUpdateNameEnricher implements Handler<SubjectPayload, SubjectPay
Map<String, Name> nameByPhone = personService.findNameByNumber(subjects); Map<String, Name> nameByPhone = personService.findNameByNumber(subjects);
List<PhonesMap> subjectForSave = subjects.stream().flatMap(subject -> { List<PhonesMap> subjectForSave = subjects.stream().flatMap(subject -> {
Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(subject.getPhone().toString())); Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(subject.getPhone()));
if (name == null) { if (name == null) {
//todo set fid to null //todo set fid to null
return Stream.of(PhonesMap.builder() return Stream.of(PhonesMap.builder()

4
src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java
View file

@ -98,8 +98,8 @@ public class CTUtil {
} }
} }
public static String normalizePhoneNumber(String phoneNumber) { public static String normalizePhoneNumber(Long phoneNumber) {
return "9" + phoneNumber; return "9" + String.format("%09d", phoneNumber);
} }
public static String defineIdType(String idType, String idType2) { public static String defineIdType(String idType, String idType2) {

2
src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml
View file

@ -65,7 +65,7 @@
<select id="insertPackage" resultType="java.lang.Long" <select id="insertPackage" resultType="java.lang.Long"
parameterType="ru.nbch.credit_tracker.entities.app.UserPackage"> parameterType="ru.nbch.credit_tracker.entities.app.UserPackage">
INSERT INTO signals_user_packages (membercode, package_name, signal_types, created_at, status, external_package_name) INSERT INTO signals_user_packages (membercode, package_name, signal_types, created_at, status, external_package_name)
values (#{userPackage.userId}, #{userPackage.packageName}, #{userPackage.signalTypes}, #{userPackage.createdAt}, #{userPackage.status}, concat(substring(#{serPackage.userId}, 1, 6), , '_', #{userPackage.packageName})) RETURNING id values (#{userPackage.userId}, #{userPackage.packageName}, #{userPackage.signalTypes}, #{userPackage.createdAt}, #{userPackage.status}, concat(substring(#{userPackage.userId}, 1, 6), '_', #{userPackage.packageName})) RETURNING id
</select> </select>
<update id="updatePackageStatus"> <update id="updatePackageStatus">