Эх сурвалжийг харах

修改内购测试设备返回套餐

linhaohong 1 жил өмнө
parent
commit
194e4ae833

+ 13 - 5
Controller/CloudStorage.py

@@ -21,7 +21,8 @@ from django.http import JsonResponse, HttpResponseRedirect, HttpResponse
 from django.views.generic.base import View
 
 from Ansjer.config import SERVER_DOMAIN, PAYPAL_CRD, SERVER_DOMAIN_SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, \
-    AWS_ARN, OAUTH_ACCESS_TOKEN_SECRET, DETECT_PUSH_DOMAINS, CONFIG_INFO, CONFIG_CN, BINOCULAR_DEVICE_TYPE, CONFIG_US
+    AWS_ARN, OAUTH_ACCESS_TOKEN_SECRET, DETECT_PUSH_DOMAINS, CONFIG_INFO, CONFIG_CN, BINOCULAR_DEVICE_TYPE, CONFIG_US, \
+    CONFIG_TEST, CONFIG_EUR
 from Controller.CheckUserData import DataValid
 from Controller.CloudPhoto.CloudServiceController import CloudServiceController
 from Controller.PaymentCycle import Paypal
@@ -228,12 +229,19 @@ class CloudStorageView(View):
 
                 if CONFIG_INFO != CONFIG_CN:  # 国内生产环境不筛选像素 加载所有上架套餐
                     store_qs = store_qs.filter(Q(pixel_level=pixel_level))
-                if is_ios and uid in ["517J385BNUGP3CPP111A", "MKNB6CWZEG988NTS111A", "VXJ267WU5NZ1S89H111A", "18SM4J9DYWB2AEG1111A"]:
-                    store_qs = store_qs.filter(pay_type__in=[5, 99])
-                elif is_ios:
+                if is_ios:
                     store_qs = store_qs.filter(pay_type=5)
                 else:
-                    store_qs = store_qs.exclude(pay_type__in=[5, 99])
+                    store_qs = store_qs.exclude(pay_type=5)
+                if uid not in ["VXJ267WU5NZ1S89H111A", "18SM4J9DYWB2AEG1111A",
+                               "517J385BNUGP3CPP111A"] and CONFIG_INFO == CONFIG_TEST:
+                    store_qs = store_qs.exclude(id=88)
+                elif uid not in ["VXJ267WU5NZ1S89H111A", "18SM4J9DYWB2AEG1111A",
+                               "517J385BNUGP3CPP111A"] and CONFIG_INFO == CONFIG_US:
+                    store_qs = store_qs.exclude(id=34)
+                elif uid not in ["VXJ267WU5NZ1S89H111A", "18SM4J9DYWB2AEG1111A",
+                               "517J385BNUGP3CPP111A"] and CONFIG_INFO == CONFIG_EUR:
+                    store_qs = store_qs.exclude(id=34)
             else:
                 is_ai = uid_set_qs[0]['is_ai']
                 is_ai = 1 if is_ai != 2 and CONFIG_INFO != CONFIG_CN else 0  # 国内不支持AI服务