fix: copy price
This commit is contained in:
@@ -247,7 +247,8 @@ class DealService(BaseService):
|
|||||||
total_products=products_count,
|
total_products=products_count,
|
||||||
delivery_date=deal.delivery_date,
|
delivery_date=deal.delivery_date,
|
||||||
receiving_slot_date=deal.receiving_slot_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)
|
return DealSummaryResponse(summaries=summaries)
|
||||||
@@ -669,8 +670,7 @@ class DealService(BaseService):
|
|||||||
)
|
)
|
||||||
deal_product_services: list[models.DealProductService] = (
|
deal_product_services: list[models.DealProductService] = (
|
||||||
await self.session.scalars(source_services_stmt)).all()
|
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 = (
|
destination_deal_products_stmt = (
|
||||||
select(
|
select(
|
||||||
models.DealProduct
|
models.DealProduct
|
||||||
@@ -683,13 +683,12 @@ class DealService(BaseService):
|
|||||||
destination_deal_products = (await self.session.scalars(destination_deal_products_stmt)).all()
|
destination_deal_products = (await self.session.scalars(destination_deal_products_stmt)).all()
|
||||||
insert_data = []
|
insert_data = []
|
||||||
for deal_product in destination_deal_products:
|
for deal_product in destination_deal_products:
|
||||||
for service in source_services:
|
for service in deal_product_services:
|
||||||
service_price = self.get_service_price(service, deal_product.quantity)
|
|
||||||
insert_data.append({
|
insert_data.append({
|
||||||
'deal_id': request.deal_id,
|
'deal_id': request.deal_id,
|
||||||
'product_id': deal_product.product_id,
|
'product_id': deal_product.product_id,
|
||||||
'service_id': service.id,
|
'service_id': service.service.id,
|
||||||
'price': service_price
|
'price': service.price
|
||||||
})
|
})
|
||||||
if not insert_data:
|
if not insert_data:
|
||||||
return DealServicesCopyResponse(ok=True, message='Услуги успешно перенесены')
|
return DealServicesCopyResponse(ok=True, message='Услуги успешно перенесены')
|
||||||
|
|||||||
Reference in New Issue
Block a user