linhaohong 4 сар өмнө
parent
commit
134a414a6f

+ 14 - 2
Controller/CloudStorage.py

@@ -32,7 +32,7 @@ from Model.models import Device_Info, Order_Model, Store_Meal, VodHlsModel, UID_
     ExperienceContextModel, Pay_Type, CDKcontextModel, Device_User, SysMsgModel, Unused_Uid_Meal, PromotionRuleModel, \
     ExperienceContextModel, Pay_Type, CDKcontextModel, Device_User, SysMsgModel, Unused_Uid_Meal, PromotionRuleModel, \
     VideoPlaybackTimeModel, CouponModel, VodBucketModel, VodHlsSummary, AiService, UidSetModel, UidPushModel, \
     VideoPlaybackTimeModel, CouponModel, VodBucketModel, VodHlsSummary, AiService, UidSetModel, UidPushModel, \
     VodHlsTagType, ICloudStoreMeal, IcloudUseDetails, IcloudService, StsFrequency, DeviceApplePackage, \
     VodHlsTagType, ICloudStoreMeal, IcloudUseDetails, IcloudService, StsFrequency, DeviceApplePackage, \
-    InAppPurchasePackage, CouponCombo, CouponConfigModel, UserExModel
+    InAppPurchasePackage, CouponCombo, CouponConfigModel, UserExModel, DeviceVersionInfo
 from Object.AWS.AmazonS3Util import AmazonS3Util
 from Object.AWS.AmazonS3Util import AmazonS3Util
 from Object.AWS.S3Email import S3Email
 from Object.AWS.S3Email import S3Email
 from Object.AliPayObject import AliPayObject
 from Object.AliPayObject import AliPayObject
@@ -211,7 +211,7 @@ class CloudStorageView(View):
             return response.json(0)
             return response.json(0)
         try:
         try:
             # 查询设备像素
             # 查询设备像素
-            uid_set_qs = UidSetModel.objects.filter(uid=uid).values('ucode', 'is_ai')
+            uid_set_qs = UidSetModel.objects.filter(uid=uid).values('ucode', 'is_ai', 'mobile_4g')
             if not uid_set_qs.exists():
             if not uid_set_qs.exists():
                 return response.json(173)
                 return response.json(173)
             ucode = uid_set_qs[0]['ucode']
             ucode = uid_set_qs[0]['ucode']
@@ -222,6 +222,18 @@ class CloudStorageView(View):
                 else:
                 else:
                     dpi_flag = int(ucode[-5])
                     dpi_flag = int(ucode[-5])
             pixel_level = 1 if ucode and dpi_flag >= 8 else 0
             pixel_level = 1 if ucode and dpi_flag >= 8 else 0
+
+            # 查询是否为4G设备
+            is_4g = 0
+            is_mobile_4g = uid_set_qs[0]['mobile_4g']
+            device_version_info_qs = DeviceVersionInfo.objects.filter(d_code=ucode).values('supports_4g')
+            if device_version_info_qs.exists():
+                is_supports_4g = device_version_info_qs[0]['supports_4g']
+            else:
+                is_supports_4g = 0
+            if is_mobile_4g or is_supports_4g:
+                is_4g = 1
+
             store_qs = Store_Meal.objects.filter(Q(lang__lang=lang), Q(is_show=0), ~Q(pay_type='11'))  # 过滤激活码、隐藏套餐
             store_qs = Store_Meal.objects.filter(Q(lang__lang=lang), Q(is_show=0), ~Q(pay_type='11'))  # 过滤激活码、隐藏套餐
             experience_context_qs = ExperienceContextModel.objects.filter(uid=uid, experience_type=0)
             experience_context_qs = ExperienceContextModel.objects.filter(uid=uid, experience_type=0)
 
 

+ 1 - 0
Model/models.py

@@ -1689,6 +1689,7 @@ class Store_Meal(models.Model):
     is_ai = models.SmallIntegerField(default=0, verbose_name='是否支持AI')  # 0:不支持;1:支持
     is_ai = models.SmallIntegerField(default=0, verbose_name='是否支持AI')  # 0:不支持;1:支持
     product_id = models.CharField(default='', max_length=64, verbose_name='商品id')
     product_id = models.CharField(default='', max_length=64, verbose_name='商品id')
     app_type = models.SmallIntegerField(default=0, verbose_name='app类型')  # 1:ZosiSmart苹果; 2:Vsees苹果
     app_type = models.SmallIntegerField(default=0, verbose_name='app类型')  # 1:ZosiSmart苹果; 2:Vsees苹果
+    is_4G = models.SmallIntegerField(default=0, verbose_name='是否支持4G')
 
 
     def __str__(self):
     def __str__(self):
         return self.id
         return self.id