treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1226 commits 104 branches 25 tags 1.1 GiB
Commit graph

345 commits

Author SHA1 Message Date
psemenkov
4b8c8fc2bb Merge remote-tracking branch 'origin/dev' into dev 2023-05-19 16:09:13 +03:00
ialbert
02e927ab1b http://jira.mfd.msk:8088/browse/CLS-290 2023-05-18 14:58:11 +03:00
ialbert
c8725ae10f Merge remote-tracking branch 'origin/dev' into dev 2023-05-18 13:47:31 +03:00
ialbert
c7fefd481c http://jira.mfd.msk:8088/browse/CLS-290 2023-05-18 13:47:13 +03:00
psemenkov
2b038a3b04 http://jira.mfd.msk:8088/browse/CLS-313 
Привел модуль в соответствие с новым ТЗ.
 2023-05-18 12:22:09 +03:00
akulikov
8d67330505 Merge remote-tracking branch 'origin/cls-283' into dev 
# Conflicts:
#	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionDeposit.java
#	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionFond.java
 2023-05-18 11:02:58 +03:00
akulikov
90b8d80ce8 fix after review 2023-05-17 19:50:20 +03:00
ialbert
ea4ef2f09c Merge remote-tracking branch 'origin/dev' into dev 2023-05-17 18:20:41 +03:00
ialbert
967877537d http://jira.mfd.msk:8088/browse/CLS-290 2023-05-17 18:19:57 +03:00
AKurakin
35a7a41091 clearing-service http://jira.mfd.msk:8088/browse/CLS-290 обработчик для шага 6 2023-05-17 17:51:05 +03:00
AKurakin
4e37cf7757 http://jira.mfd.msk:8088/browse/CLS-293 DDL meta 4.2 2023-05-17 14:45:43 +03:00
akulikov
94ab971af1 some fixes and tests 2023-05-16 21:26:24 +03:00
ialbert
fe79868712 Merge remote-tracking branch 'origin/dev' into dev 2023-05-16 19:19:02 +03:00
ialbert
fc82c9817c http://jira.mfd.msk:8088/browse/CLS-290 2023-05-16 19:15:30 +03:00
AKurakin
754df8edad company-service/account-service http://jira.mfd.msk:8088/browse/CLS-272 рефакторинг: перенёс ClientCodeService. 2023-05-16 18:05:58 +03:00
ialbert
f80c10ef04 Merge remote-tracking branch 'origin/dev' into dev 2023-05-16 15:28:32 +03:00
ialbert
64a28bc5a5 http://jira.mfd.msk:8088/browse/CLS-290 2023-05-16 15:28:23 +03:00
AKurakin
3172be7554 . 2023-05-16 14:54:24 +03:00
AKurakin
11c1e705f0 Merge branch 'aalehin' into dev 
# Conflicts:
#	clearing-parent/backend-api/src/main/resources/meta/meta.xml
#	clearing-parent/backend-api/src/test/resources/meta.json
#	clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ContractRegisterServiceTest.java
#	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
#	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java
 2023-05-16 14:43:53 +03:00
ialbert
5ba662b11a Merge branch 'dev' into CLS-277-execution-deposit 2023-05-16 13:42:44 +03:00
ialbert
a7e2929cdb http://jira.mfd.msk:8088/browse/CLS-290 2023-05-16 13:41:36 +03:00
AKurakin
3fdc6b1dbc backend-api http://jira.mfd.msk:8088/browse/CLS-309 2023-05-15 19:53:47 +03:00
akulikov
47fbbabb1b report create methods 2023-05-15 18:33:18 +03:00
akulikov
c76aee2428 report requests validators 2023-05-15 18:06:02 +03:00
akulikov
a2873620a3 report requests 2023-05-15 17:21:59 +03:00
akulikov
b59597bc7b fixes 2023-05-15 16:20:22 +03:00
akulikov
1551ad04c8 Merge branch 'dev' into cls-283 
# Conflicts:
#	clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P2_Collector.java
#	platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/Market.java
 2023-05-15 15:59:11 +03:00
AKurakin
0dd8b6840c backend-api http://jira.mfd.msk:8088/browse/CLS-306 2023-05-15 12:07:30 +03:00
ialbert
6c23cbca36 http://jira.mfd.msk:8088/browse/CLS-290 добавил Spring KafkaTemplate 2023-05-15 12:04:05 +03:00
akulikov
75e8a83aad SummaryLiabilitiesClaimsReportBuilder 
SummaryMoneyChangeReportBuilder
 2023-05-15 11:37:27 +03:00
AKurakin
f05e93e14e platform-messaging поправил возврат текста ошибки валидаций в очередь "request-info-update" 2023-05-12 18:38:01 +03:00
akulikov
c3a1cc41de ExecutedDealReport, OperationalLiabilitiesClaimsReport, OperationalMoneyChangeReport, UnfulfilledDealReport 2023-05-12 18:09:54 +03:00
etreschenkov
0147b88ba8 http://jira.mfd.msk:8088/browse/CLS-302 2023-05-12 17:45:49 +03:00
AKurakin
f74937ab8e backend-api поправил тесты 2023-05-12 15:49:18 +03:00
AKurakin
97da625d64 backend-api http://jira.mfd.msk:8088/browse/CLS-257 http://jira.mfd.msk:8088/browse/CLS-256 сверка с метой. 2023-05-12 15:25:03 +03:00
AKurakin
44b8455ea6 company-service изменил ожидаемую очередь, изменил валидацию для обновления заблокированной компании. 2023-05-12 14:38:24 +03:00
psemenkov
008a3dbf36 Merge remote-tracking branch 'origin/dev' into dev 2023-05-12 12:42:16 +03:00
AKurakin
e13968a148 backend-api мелкий рефакторинг 4 2023-05-12 12:21:47 +03:00
psemenkov
d5c929f2a4 http://jira.mfd.msk:8088/browse/CLS-262 
Добавил .sh, сделал алгоритмы выгрузки и тесты.
 2023-05-12 11:34:54 +03:00
AKurakin
4968bce3a5 backend-api мелкий рефакторинг 3 2023-05-12 10:53:23 +03:00
AKurakin
7a858cf422 Merge branch 'meta_4' into dev 2023-05-11 17:33:11 +03:00
aalehin
680d572385 fix up with meta based classes 2023-05-11 14:37:17 +03:00
AKurakin
457f051588 http://jira.mfd.msk:8088/browse/CLS-293 meta 4: правка кода, чтобы компилировалось. 2023-05-11 14:31:24 +03:00
AKurakin
c752efceec http://jira.mfd.msk:8088/browse/CLS-293 meta 4: доделал классы (не компилируется) 2023-05-11 14:20:11 +03:00
aalehin
59bfa7124e Merge branch 'meta_4' of http://git.mfd.msk/mfd/clearing into aalehin 
 Conflicts:
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExecutionRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java
	platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java
	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java
 2023-05-11 13:58:44 +03:00
akulikov
0022cb6b22 cls-283 base service 2023-05-11 13:57:29 +03:00
psemenkov
39167a2e8e Merge remote-tracking branch 'origin/CLS-262' into dev 2023-05-11 13:51:13 +03:00
psemenkov
b214aa8415 Merge remote-tracking branch 'origin/dev' into CLS-262 2023-05-11 13:50:12 +03:00
ialbert
837485e96e Merge branch 'dev' into CLS-277-execution-deposit 
# Conflicts:
#	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java
 2023-05-11 12:23:28 +03:00
ialbert
3931d453da http://jira.mfd.msk:8088/browse/CLS-290 Добавил CORRELATION_ID header в сообщения кафки, для использования Spring ReplyingKafkaTemplate 2023-05-11 12:18:48 +03:00