From 5b47acad37a0e1a94ae45d8f25bcd13b80439b26 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Tue, 3 Jun 2025 22:20:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROJECT/app/app_vlad.c | 26 ++++++++++++++++++++++++-- PROJECT/app/journal.c | 6 +++--- PROJECT/data/datadesc.c | 6 +++--- PROJECT/menu/menudesc.c | 8 ++++---- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/PROJECT/app/app_vlad.c b/PROJECT/app/app_vlad.c index 235d044..8d5e2bd 100644 --- a/PROJECT/app/app_vlad.c +++ b/PROJECT/app/app_vlad.c @@ -1042,7 +1042,18 @@ void AppVladEventProcess(CPU_INT32U event) if(!write_mifare_card()) { - SaveEventRecord(app_state.ch_index, JOURNAL_EVENT_ABONEMENT_REJECTED, 0); + TEventRecord record; // 18 + 4 = 22 + record.event = JOURNAL_EVENT_ABONEMENT_REJECTED; // +1 + record.type_abonement = data->type_abonement; // +1 + record.money = 0; // +2 + record.bonus = 0; // +2 + record.time_before = data->best_before; // +4 + record.number_abonement = data->number_abonement; // +4 + record.money_sum = data->money; // +2 + record.bonus_sum = data->bonus; // +2 + + SaveEventAbonementRecord(&record); + UserPrintPaymentErrorMenu(); RefreshMenu(); app_state.user_menu = USER_MENU_CARD_FAIL; @@ -1093,7 +1104,18 @@ void AppVladEventProcess(CPU_INT32U event) } else { - SaveEventRecord(app_state.ch_index, JOURNAL_EVENT_ABONEMENT_REJECTED, 0); + TEventRecord record; // 18 + 4 = 22 + record.event = JOURNAL_EVENT_ABONEMENT_REJECTED; // +1 + record.type_abonement = data->type_abonement; // +1 + record.money = 0; // +2 + record.bonus = 0; // +2 + record.time_before = data->best_before; // +4 + record.number_abonement = data->number_abonement; // +4 + record.money_sum = data->money; // +2 + record.bonus_sum = data->bonus; // +2 + + SaveEventAbonementRecord(&record); + UserPrintPaymentErrorMenu(); RefreshMenu(); app_state.user_menu = USER_MENU_CARD_FAIL; diff --git a/PROJECT/app/journal.c b/PROJECT/app/journal.c index 45fbc82..d39fa94 100644 --- a/PROJECT/app/journal.c +++ b/PROJECT/app/journal.c @@ -221,13 +221,13 @@ void GetEventStr(char* str, char event) sprintf(str, "БКЗ.оплата "); break; case JOURNAL_EVENT_ABONEMENT_REJECTED: - sprintf(str, "БКЗ.оплата "); + sprintf(str, "БКЗ.отказ "); break; case JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED: - sprintf(str, "БКЗ.пополнение "); + sprintf(str, "БКЗ.пополн."); break; case JOURNAL_EVENT_ABONEMENT_PAY_REJECTED: - sprintf(str, "БКЗ.пополнение "); + sprintf(str, "БКЗ.пополн."); break; case JOURNAL_EVENT_ABONEMENT_BALANCE: sprintf(str, "БКЗ.баланс "); diff --git a/PROJECT/data/datadesc.c b/PROJECT/data/datadesc.c index 3c0e6bd..2832da9 100644 --- a/PROJECT/data/datadesc.c +++ b/PROJECT/data/datadesc.c @@ -6315,7 +6315,7 @@ CPU_INT08U const CounterSolarCardMoneyName[] = " TDataDescStruct const CounterSolarCardMoneyDesc = { DATA_DESC_VIEW, // тип дескриптора - DATA_TYPE_RUB_CENT, // тип параметра + DATA_TYPE_ULONG, // тип параметра DATA_LOC_FRAM, // расположение параметра DATA_IS_ARRAY, // признак массива CHANNELS_NUM * SOLAR_MODES_COUNT, // размер массива @@ -6483,7 +6483,7 @@ CPU_INT08U const CounterModeCardMoneyName[] = " TDataDescStruct const CounterModeCardMoneyDesc = { DATA_DESC_VIEW, // тип дескриптора - DATA_TYPE_RUB_CENT, // тип параметра + DATA_TYPE_ULONG, // тип параметра DATA_LOC_FRAM, // расположение параметра DATA_IS_ARRAY, // признак массива SOLAR_MODES_COUNT, // размер массива @@ -6892,7 +6892,7 @@ CPU_INT08U const CounterAbonementMoneyName[] = " TDataDescStruct const CounterAbonementMoneyDesc = { DATA_DESC_VIEW, // тип дескриптора - DATA_TYPE_RUB_CENT, // тип параметра + DATA_TYPE_ULONG, // тип параметра DATA_LOC_FRAM, // расположение параметра DATA_NO_ARRAY, // признак массива 0, // размер массива diff --git a/PROJECT/menu/menudesc.c b/PROJECT/menu/menudesc.c index 56ef050..2efae73 100644 --- a/PROJECT/menu/menudesc.c +++ b/PROJECT/menu/menudesc.c @@ -2374,16 +2374,16 @@ void PrintEventJournalRecord(TEventRecord *record, char *str_event, char *str_da } else if (record->event == JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED) { - sprintf(&str_event[strlen(str_event)], " %dр", record->money); + sprintf(&str_event[strlen(str_event)], " %dр %d", record->money, record->type_abonement + 1); char str[32]; PrintDateString(str, record->time_before); - sprintf(str_data, "%x %dр %dБ %s %d", record->number_abonement, record->money_sum, record->bonus_sum, str, record->type_abonement + 1); + sprintf(str_data, "%x %dр %dБ %s %d", record->number_abonement, record->money_sum, record->bonus_sum, str); } else if (record->event == JOURNAL_EVENT_ABONEMENT_REJECTED) { - sprintf(str_data, "Отказ %dруб %dБ", record->money, record->bonus); + sprintf(str_data, "%x %dруб %dБ", record->number_abonement, record->money_sum, record->bonus_sum); } else if (record->event == JOURNAL_EVENT_ABONEMENT_PAY_REJECTED) { @@ -2399,7 +2399,7 @@ void PrintEventJournalRecord(TEventRecord *record, char *str_event, char *str_da } else if (record->event == JOURNAL_EVENT_ABONEMENT_WRONG) { - sprintf(str_data, "id %x. Код ошибки %ld", record->number_abonement, record->number_abonement); + sprintf(str_data, "%x. Код ошибки %ld", record->number_abonement, record->password); } else if (record->event == JOURNAL_EVENT_CARD_REJECTED) {