loading_count_fix

dev
AlexP077 2 years ago
parent 2b73aae247
commit 2e7147b7cd

@ -61,6 +61,7 @@ class PointService:
if obj: if obj:
if cat == 'Подъезд жилого дома': if cat == 'Подъезд жилого дома':
objs = obj.all() objs = obj.all()
total+=objs.count()-1
else: else:
objs = [obj.first()] objs = [obj.first()]
for o in objs: for o in objs:
@ -84,8 +85,8 @@ class PointService:
models.PrePlacementPointPVZDistance.objects.get_or_create(placement_point=pre_obj, models.PrePlacementPointPVZDistance.objects.get_or_create(placement_point=pre_obj,
pvz_postamates_group=d.pvz_postamates_group, pvz_postamates_group=d.pvz_postamates_group,
dist=d.dist) dist=d.dist)
matched += 1
matched += 1
elif not rayon: elif not rayon:
models.PrePlacementPoint.objects.get_or_create(street=response.get('street'), models.PrePlacementPoint.objects.get_or_create(street=response.get('street'),
house_number=response.get('houseNumber'), house_number=response.get('houseNumber'),
@ -104,6 +105,7 @@ class PointService:
house_number=response.get('houseNumber')).values().first() house_number=response.get('houseNumber')).values().first()
house.pop('id') house.pop('id')
if house.get('doors') and house.get('doors') > 1: if house.get('doors') and house.get('doors') > 1:
total+=house.get('doors')-1
house['flat_cnt'] = int(house['flat_cnt'] / house['doors']) house['flat_cnt'] = int(house['flat_cnt'] / house['doors'])
for _num in range(house['doors']): for _num in range(house['doors']):
models.PrePlacementPoint.objects.get_or_create(address=addr, models.PrePlacementPoint.objects.get_or_create(address=addr,

Loading…
Cancel
Save