Commit graph

778 commits

Author SHA1 Message Date
ialbert
a6c6a7d733 http://jira.mfd.msk:8088/browse/CLS-130 2023-02-08 13:36:48 +03:00
ialbert
2d3808460e http://jira.mfd.msk:8088/browse/CLS-189 2023-02-08 12:00:28 +03:00
ialbert
8ae1c18344 Merge remote-tracking branch 'origin/dev' into dev 2023-02-08 11:21:38 +03:00
ialbert
26696e73ba http://jira.mfd.msk:8088/browse/CLS-189 2023-02-08 11:21:25 +03:00
AKurakin
e6e7dd57c6 http://jira.mfd.msk:8088/browse/CLS-189 fix npe три 2023-02-08 11:10:00 +03:00
AKurakin
502a343c55 clearing-service http://jira.mfd.msk:8088/browse/CLS-188 правка ExecutionDepositComponent для http://jira.mfd.msk:8088/browse/CLS-189 - оказалось S_TRADE бывают с одинаковыми tradeNum 2023-02-08 10:58:26 +03:00
AKurakin
150468f823 http://jira.mfd.msk:8088/browse/CLS-189 fix PaymentInstructionCreator поправил AddresseeId для V 2023-02-07 19:07:22 +03:00
ialbert
13be0ab471 http://jira.mfd.msk:8088/browse/CLS-189 2023-02-07 18:34:27 +03:00
AKurakin
8a41f93e19 http://jira.mfd.msk:8088/browse/CLS-189 fix npe два (но тут еррор добавил 2023-02-07 17:52:50 +03:00
AKurakin
5c74626e76 http://jira.mfd.msk:8088/browse/CLS-189 fix npe раз 2023-02-07 17:17:57 +03:00
AKurakin
553bf5b93c http://jira.mfd.msk:8088/browse/CLS-189 final merge code 2023-02-07 16:55:21 +03:00
ialbert
37e7ee1f2e Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java
2023-02-07 16:46:19 +03:00
ialbert
dc0a214306 http://jira.mfd.msk:8088/browse/CLS-189 2023-02-07 16:41:55 +03:00
AKurakin
52d4c654a1 http://jira.mfd.msk:8088/browse/CLS-189 PaymentInstructionCreator ПеРеДелКа часть с PaymentInstruction 2023-02-07 15:44:26 +03:00
AKurakin
afb0e6c182 http://jira.mfd.msk:8088/browse/CLS-189 PaymentInstructionCreator account I bug fix 2023-02-07 14:27:02 +03:00
AKurakin
bb96118df0 http://jira.mfd.msk:8088/browse/CLS-189 добавил логов trace 2023-02-07 14:10:59 +03:00
AKurakin
687b50d970 http://jira.mfd.msk:8088/browse/CLS-189 PaymentInstructionCreator мелкая правка, добавил логов trace 2023-02-07 14:08:20 +03:00
ialbert
722b6ff385 Merge remote-tracking branch 'origin/dev' into dev 2023-02-07 13:36:45 +03:00
ialbert
2ad1233863 http://jira.mfd.msk:8088/browse/CLS-130 added test SdfCreatorBySTLDPayment 2023-02-07 13:36:37 +03:00
AKurakin
c1f0923433 http://jira.mfd.msk:8088/browse/CLS-189 PaymentInstructionCreator мелкая правка B 2023-02-07 13:18:13 +03:00
ialbert
d22a4048aa Merge remote-tracking branch 'origin/dev' into dev 2023-02-07 13:15:50 +03:00
ialbert
54e7a99b77 http://jira.mfd.msk:8088/browse/CLS-130 2023-02-07 13:15:42 +03:00
AKurakin
15d836fade http://jira.mfd.msk:8088/browse/CLS-189 PaymentInstructionCreator правка 2023-02-07 11:07:33 +03:00
ialbert
09605b610d http://jira.mfd.msk:8088/browse/CLS-130 2023-02-06 20:06:34 +03:00
ialbert
0e8ea7b595 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java
2023-02-06 18:31:06 +03:00
ialbert
d1b9543d35 http://jira.mfd.msk:8088/browse/CLS-189 2023-02-06 18:29:36 +03:00
etreschenkov
52b600dbbf update meta 2023-02-06 17:46:32 +03:00
AKurakin
f13bfbf9ac http://jira.mfd.msk:8088/browse/CLS-189 PaymentInstructionCreator правка заполнения LiabilitiesClaimsMoney для 2 ног 2023-02-06 17:12:34 +03:00
AKurakin
f60bfdd318 http://jira.mfd.msk:8088/browse/CLS-189 PaymentInstructionCreator правка заполнения из Credit/DebitLegAmount пустого. 2023-02-06 13:38:34 +03:00
AKurakin
e960fb6cb4 http://jira.mfd.msk:8088/browse/CLS-189 PaymentInstructionCreator правка заполнения из Credit/DebitLegAmount пустого. 2023-02-06 13:20:47 +03:00
AKurakin
1922203226 http://jira.mfd.msk:8088/browse/CLS-189 PaymentInstructionCreator правка заполнения payment1/2.getAddresseeId по executionDeposit 2023-02-06 12:36:45 +03:00
AKurakin
841ad76fe8 http://jira.mfd.msk:8088/browse/CLS-189 fix NPE PaymentInstructionCreator когда payment2.getAddresseeId == null - будет warn. Основная причина: securityId = %s and companyId <> %s 2023-02-06 11:20:37 +03:00
ialbert
8415cfd243 http://jira.mfd.msk:8088/browse/CLS-189 fix SqlPredicate -> equal predicate 2023-02-03 19:42:57 +03:00
ialbert
520dcfe9be Merge remote-tracking branch 'origin/dev' into dev 2023-02-03 18:44:28 +03:00
ialbert
c5633916c6 http://jira.mfd.msk:8088/browse/CLS-189 sql predicate date fix 2023-02-03 18:44:20 +03:00
etreschenkov
c6600ada46 update meta 2023-02-03 18:07:57 +03:00
ialbert
e105aad7eb http://jira.mfd.msk:8088/browse/CLS-189 AccountBalance change 2023-02-03 17:47:34 +03:00
ialbert
ef0a4a09c7 http://jira.mfd.msk:8088/browse/CLS-189 2023-02-03 17:09:14 +03:00
ialbert
0f2c8bf2dc http://jira.mfd.msk:8088/browse/CLS-189 2023-02-03 16:52:03 +03:00
AKurakin
c9676d3dfb http://jira.mfd.msk:8088/browse/CLS-189 интеграция кода 2023-02-03 16:47:10 +03:00
ialbert
12511a48e9 http://jira.mfd.msk:8088/browse/CLS-189 2023-02-03 16:26:07 +03:00
ialbert
e924df5be2 Merge remote-tracking branch 'origin/dev' into dev 2023-02-03 13:40:03 +03:00
ialbert
da5d08e1d8 http://jira.mfd.msk:8088/browse/CLS-189 account balance bug fix NLPs 2023-02-03 13:39:53 +03:00
etreshenkov
c38fa5c0bf http://jira.mfd.msk:8088/browse/CLS-217 2023-02-03 12:19:34 +03:00
ialbert
af192d5a32 http://jira.mfd.msk:8088/browse/CLS-189 bug fix 2023-02-03 11:21:13 +03:00
ialbert
b448d6b208 http://jira.mfd.msk:8088/browse/CLS-189 bug fix 2023-02-02 18:02:53 +03:00
ialbert
01c22e449d http://jira.mfd.msk:8088/browse/CLS-189 NLP fix 2023-02-02 17:40:53 +03:00
ialbert
c77444c4df http://jira.mfd.msk:8088/browse/CLS-189 added logging 2023-02-02 16:52:10 +03:00
ialbert
89059e8b46 http://jira.mfd.msk:8088/browse/CLS-189 added logging 2023-02-02 16:45:24 +03:00
ialbert
2b11d25ac2 http://jira.mfd.msk:8088/browse/CLS-189 added logging 2023-02-02 16:44:19 +03:00