STDEV-20296 #57
Open
STDEV-20296 #57
+255
−18
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Добавлены поля для передачи состояния оплаты и id банковской сессии.
# Conflicts: # app/src/main/java/ru/evotor/devices/drivers/paysystem/PayResult.java
подлит девелоп. Резолв конфликтов.
Вернул readExpandData вместо readExpand
npe при paymentState.name()
temp commit (test)
temp commit (test №2)
Вернул версионирование
# Conflicts: # app/src/main/java/ru/evotor/devices/drivers/paysystem/PayResult.java
merge develop
This reverts commit 4fca07e.
Добавлен LoyaltyCardId
Расширен конструктор PaymentRequest
Актуализация состава PayResult
Конструктор для PayResult
Конструктор для PayResult #2
This reverts commit 223b501.
Сумма бонусов в PaymentRequest
flooduk
reviewed
Jan 13, 2026
| @@ -0,0 +1,28 @@ | |||
| package ru.evotor.devices.drivers.paysystem; | |||
Contributor
There was a problem hiding this comment.
кажется, это уже было в симпсонах =/
я видел этот код, и кажется он уже где-то есть
flooduk
reviewed
Jan 13, 2026
| if (VERSION >= 2) { | ||
| parcel1.writeString(paymentSessionId); | ||
| parcel1.writeString(loyaltyCardId); | ||
| parcel1.writeString(earnedBonus.toPlainString()); |
flooduk
reviewed
Jan 13, 2026
| if (currentVersion >= 2) { | ||
| paymentSessionId = parcel1.readString(); | ||
| loyaltyCardId = parcel1.readString(); | ||
| earnedBonus = new BigDecimal(parcel1.readString()); |
flooduk
reviewed
Jan 13, 2026
| * Может быть null | ||
| */ | ||
| private final String additionalDescription; | ||
| private String additionalDescription; |
flooduk
reviewed
Jan 13, 2026
| if (currentVersion >= 7) { | ||
| String paymentStateName = parcel1.readString(); | ||
| if (paymentStateName != null) { | ||
| paymentState = Constants.PaymentState.valueOf(paymentStateName); |
Contributor
There was a problem hiding this comment.
тут может быть рандомная строка, нужна валидация, хотя бы через try/catch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Поддержка работы драйверов, допускающих работу в режиме прерывания (с поддержкой программ лояльности).
PaymentRequest:
PayResult