From 2e491db16c68d2be1059d180df994b6e0da3e512 Mon Sep 17 00:00:00 2001 From: youngS Date: Fri, 26 Nov 2021 17:19:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fir_ser/api/utils/app/supersignutils.py | 4 ++-- fir_ser/api/utils/utils.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fir_ser/api/utils/app/supersignutils.py b/fir_ser/api/utils/app/supersignutils.py index 43e00d6..23c34ca 100644 --- a/fir_ser/api/utils/app/supersignutils.py +++ b/fir_ser/api/utils/app/supersignutils.py @@ -265,14 +265,14 @@ def get_developer_user_by_app_udid(user_objs, udid, app_obj): # 根据app查找开发者账户 for developer_obj in AppIOSDeveloperInfo.objects.filter( pk__in=developer_udid_obj_list.filter(developerid__apptodeveloper__app_id=app_obj)): - if get_developer_udided(developer_obj)[1] + get_developer_can_used_from_public_sign( + if get_developer_udided(developer_obj)[2] + get_developer_can_used_from_public_sign( developer_obj.user_id) < developer_obj.usable_number: logger.info(f'app_obj:{app_obj} only and return') return developer_obj, False for developer_obj in AppIOSDeveloperInfo.objects.filter(user_id__in=user_objs, is_actived=True, certid__isnull=False).order_by("created_time"): - if get_developer_udided(developer_obj)[1] + get_developer_can_used_from_public_sign( + if get_developer_udided(developer_obj)[2] + get_developer_can_used_from_public_sign( developer_obj.user_id) < developer_obj.usable_number: logger.info(f'get suitable developer and return') return developer_obj, False diff --git a/fir_ser/api/utils/utils.py b/fir_ser/api/utils/utils.py index 0716964..34c969d 100644 --- a/fir_ser/api/utils/utils.py +++ b/fir_ser/api/utils/utils.py @@ -47,7 +47,8 @@ def get_developer_udided(developer_obj): developer_udid_lists = list(udid_sync_developer_obj.values_list("udid")) if super_sing_used_obj: super_sign_udid_lists = list(super_sing_used_obj.values_list("udid__udid__udid")) - return len(set(developer_udid_lists) - set(super_sign_udid_lists)), len(set(super_sign_udid_lists)) + return len(set(developer_udid_lists) - set(super_sign_udid_lists)), len(set(super_sign_udid_lists)), len( + set(developer_udid_lists)) def get_developer_devices(developer_obj_lists): @@ -55,7 +56,7 @@ def get_developer_devices(developer_obj_lists): flyapp_used_sum = 0 max_total = 0 for dev_obj in developer_obj_lists: - other_used, flyapp_used = get_developer_udided(dev_obj) + other_used, flyapp_used, _ = get_developer_udided(dev_obj) other_used_sum += other_used flyapp_used_sum += flyapp_used max_total += 100