MH.Dmitrii/Excel-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug with refunds

Browse Source
This commit is contained in:
Dmitrii Seliakov
2026-01-13 12:51:24 +03:00
parent 4acb20c385
commit 296b066b5d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/backend/handlers/ozon_handler.py
View File

@@ -9,16 +9,17 @@ def last_day_of_month(format: str):
last_day_prev_month = first_day_current_month - datetime.timedelta(days=1) last_day_prev_month = first_day_current_month - datetime.timedelta(days=1)
return last_day_prev_month.strftime(format) return last_day_prev_month.strftime(format)
def process_sheet(df,real_arti: int,real_quantity: int,real_sum_1: int,real_sum_2: int): def process_sheet(df,real_arti: int,real_quantity: int,real_sum_1: int,real_sum_2: int):
# выбираем нужные колонки по индексам # выбираем нужные колонки по индексам
df = df.iloc[:, [real_arti, real_quantity, real_sum_1, real_sum_2]].copy() df = df.iloc[:, [real_arti, real_quantity, real_sum_1, real_sum_2]].copy()
# print("до группировки:", df.iloc[:, 2].sum())
df.dropna(inplace=True) df.dropna(inplace=True)
df = df[(df != 0).all(axis=1)] df = df[(df.iloc[:, [1]] != 0).all(axis=1)]
# складываем суммы # складываем суммы
df.iloc[:, 2] += df.iloc[:, 3] df.iloc[:, 2] += df.iloc[:, 3]
df = df.iloc[:, [0, 1, 2]] df = df.iloc[:, [0, 1, 2]]
df.columns = ['arti', 'counts', 'price'] df.columns = ['arti', 'counts', 'price']
# нормализация # нормализация
df['arti'] = df['arti'].replace(Translit.TRANSLIT, regex=True) df['arti'] = df['arti'].replace(Translit.TRANSLIT, regex=True)
df['arti'] = df['arti'].astype(str).str.upper().str.extract(f'({settings.PATTERN})') df['arti'] = df['arti'].astype(str).str.upper().str.extract(f'({settings.PATTERN})')
@@ -39,6 +40,11 @@ def process_sheet(df,real_arti: int,real_quantity: int,real_sum_1: int,real_sum_
return validated_rows return validated_rows
def evaluating(dfs): def evaluating(dfs):
validated_rows_1 = process_sheet(dfs["Отчет о реализации"], real_arti=2,real_quantity=8, real_sum_1=5,real_sum_2=6) # номера столбцов от озона validated_rows_1 = process_sheet(dfs["Отчет о реализации"], real_arti=2,real_quantity=8, real_sum_1=5,real_sum_2=6) # номера столбцов от озона
validated_rows_2 = process_sheet(dfs["Отчет о реализации"], real_arti=2,real_quantity=16, real_sum_1=13,real_sum_2=14)# validated_rows_2 = process_sheet(dfs["Отчет о реализации"], real_arti=2,real_quantity=16, real_sum_1=14,real_sum_2=15)#
sum_1 = sum(row.price for row in validated_rows_1)
sum_2 = sum(row.price for row in validated_rows_2)
print("Sum for 'Продажа':", sum_1)
print("Sum for 'Возврат':", sum_2)
date=last_day_of_month(format=settings.TIMEFORMAT) date=last_day_of_month(format=settings.TIMEFORMAT)
return validated_rows_1, validated_rows_2, date return validated_rows_1, validated_rows_2, date

1
server/backend/services/excel.py
View File

@@ -87,6 +87,7 @@ class OZONHandler(BaseHandler):
doc_creator = DocumentCreation(URL=settings.URL_REPORT) doc_creator = DocumentCreation(URL=settings.URL_REPORT)
doc_key = doc_creator.create_document( doc_key = doc_creator.create_document(
Date=validated_data[2], Date=validated_data[2],
ДатаВходящегоДокумента=validated_data[2],
ВидОперации=settings.TYPE3, ВидОперации=settings.TYPE3,
Контрагент_Key=settings.CONTRAGENT_OZON, Контрагент_Key=settings.CONTRAGENT_OZON,
ДоговорКонтрагента_Key=settings.CONTRACT_OZON, ДоговорКонтрагента_Key=settings.CONTRACT_OZON,