From 64dd40a0724882aa4293a6f7a16f1d5d1da44240 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 2 Oct 2024 10:17:18 +0300 Subject: [PATCH] fix: copy price --- services/deal.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/deal.py b/services/deal.py index 0867ace..e366bb2 100644 --- a/services/deal.py +++ b/services/deal.py @@ -247,7 +247,8 @@ class DealService(BaseService): total_products=products_count, delivery_date=deal.delivery_date, receiving_slot_date=deal.receiving_slot_date, - bill_request=deal.bill_request + bill_request=deal.bill_request, + # group=deal.group ) ) return DealSummaryResponse(summaries=summaries) @@ -669,8 +670,7 @@ class DealService(BaseService): ) deal_product_services: list[models.DealProductService] = ( await self.session.scalars(source_services_stmt)).all() - source_services: list[models.Service] = [dpc.service for dpc in deal_product_services] - + # source_services: list[models.Service] = [dpc.service for dpc in deal_product_services] destination_deal_products_stmt = ( select( models.DealProduct @@ -683,13 +683,12 @@ class DealService(BaseService): destination_deal_products = (await self.session.scalars(destination_deal_products_stmt)).all() insert_data = [] for deal_product in destination_deal_products: - for service in source_services: - service_price = self.get_service_price(service, deal_product.quantity) + for service in deal_product_services: insert_data.append({ 'deal_id': request.deal_id, 'product_id': deal_product.product_id, - 'service_id': service.id, - 'price': service_price + 'service_id': service.service.id, + 'price': service.price }) if not insert_data: return DealServicesCopyResponse(ok=True, message='Услуги успешно перенесены')